Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-01-15 00:38:37 +0300
committerRubén Dávila <rdavila84@gmail.com>2016-01-15 00:47:55 +0300
commit6b9c730e91962a6d6343bcb7fc4dc75c99b41bde (patch)
treeb9f7cafa96b131b6039e858e2c2503011551cfd6 /app/controllers/projects/compare_controller.rb
parent70bc322415b33a4789067b81387d30f1411c9091 (diff)
More refactoring from last code review. #3945
* Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
Diffstat (limited to 'app/controllers/projects/compare_controller.rb')
-rw-r--r--app/controllers/projects/compare_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 5b88aed7a64..60360c8e5c8 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -20,9 +20,9 @@ class Projects::CompareController < Projects::ApplicationController
if compare_result
@commits = Commit.decorate(compare_result.commits, @project)
@diffs = compare_result.diffs
- @diff_refs = [base_ref, head_ref]
@commit = @project.commit(head_ref)
@first_commit = @project.commit(base_ref)
+ @diff_refs = [@first_commit, @commit]
@line_notes = []
end
end