summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-01-12 12:53:54 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-01-12 12:53:54 -0500
commitf1f9b5f7d388c6d7a0938229c9211beddb2fd6a2 (patch)
tree9c9097e51a5d0b30fbfeebfc472ff3cd816b7517 /app/controllers/projects
parentc476395b4d8b78cfc7431153a144ffccbd414c61 (diff)
downloadgitlab-ce-f1f9b5f7d388c6d7a0938229c9211beddb2fd6a2.tar.gz
Small fixes from code review. #3945
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index d25adbe952d..b70533ef7be 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -104,7 +104,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@commit = @merge_request.last_commit
@first_commit = @merge_request.first_commit
@diffs = @merge_request.compare_diffs
- @diff_refs = [@merge_request.target_sha, @merge_request.source_branch]
+ @diff_refs = [@merge_request.target_sha, @merge_request.source_sha]
@ci_commit = @merge_request.ci_commit
@statuses = @ci_commit.statuses if @ci_commit