root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixup! Fix attr reader to force the intended values for source and target shas

This commit is contained in:
Douglas Barbosa Alexandre 2016-07-31 19:44:02 -03:00
parent 849e8e0c37
commit 285ba1b20f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/merge_request.rb
View File

@ -238,15 +238,11 @@ class MergeRequest < ActiveRecord::Base
end
def target_branch_sha
return @target_branch_sha if defined?(@target_branch_sha)
target_branch_head.try(:sha)
@target_branch_sha || target_branch_head.try(:sha)
end
def source_branch_sha
return @source_branch_sha if defined?(@source_branch_sha)
source_branch_head.try(:sha)
@source_branch_sha || source_branch_head.try(:sha)
end
def diff_refs