summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-08-25 13:46:59 +0100
committerSean McGivern <sean@gitlab.com>2016-08-25 13:46:59 +0100
commit79fd77953005062bfd89161770d1c0166774bb3d (patch)
tree9eb903aad78ba80ad3ddae236ac74f352d4fda19
parent7bbb523b23638c52b3c0ba43d8f3dbef8840aad6 (diff)
downloadgitlab-ce-remove-fishy-smell.tar.gz
Allow setting branch refs for MRremove-fishy-smell
-rw-r--r--app/models/merge_request.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 5330a07ee35..918be8b7e66 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -238,12 +238,12 @@ class MergeRequest < ActiveRecord::Base
def source_branch_head
source_branch_ref = @source_branch_sha || source_branch
- source_project.repository.commit(source_branch) if source_branch_ref
+ source_project.repository.commit(source_branch_ref) if source_branch_ref
end
def target_branch_head
target_branch_ref = @target_branch_sha || target_branch
- target_project.repository.commit(target_branch) if target_branch_ref
+ target_project.repository.commit(target_branch_ref) if target_branch_ref
end
def target_branch_sha