13 Mar, 2014
1 commit
-
…q into jacob-carlborg-toggle_diff_comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/assets/stylesheets/sections/commits.scss app/assets/stylesheets/sections/notes.scss app/views/projects/commits/_diffs.html.haml features/steps/project/merge_requests.rb
26 Feb, 2014
1 commit
-
If you cancel edit you will be redirected back to merge request If you submit changes you will be redirected back to merge request Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
24 Feb, 2014
2 commits
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Refactor Css
22 Feb, 2014
1 commit
-
This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
20 Feb, 2014
2 commits
-
It will redirect you to file edit page. After submit changes you will be redirected back to merge request. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
02 Jan, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
27 Nov, 2013
1 commit
17 Nov, 2013
1 commit
-
TODO: fix comment forms to respect left and right columns
14 Nov, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
01 Oct, 2013
2 commits
07 Sep, 2013
1 commit
-
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account. A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server resource usage with huge commits. Related to #1745, #2259 In addition, handle large commits for MergeRequests and Compare controllers. Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
09 Aug, 2013
1 commit
30 Jul, 2013
1 commit
-
Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
18 Jul, 2013
1 commit
17 Jul, 2013
1 commit
-
-Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
23 Jun, 2013
1 commit