diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-01-14 13:46:05 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-01-14 13:46:05 +0000 |
commit | 8c1991b9bb7e3b8d606481fdea316d633cfa5eb7 (patch) | |
tree | 58ded784f0628d25e49ee2ee30f88e956e5ab27d /app/models/merge_request.rb | |
parent | 3e9c9f97273efab6b623966597242811f8896024 (diff) | |
parent | 6e293681180870e16cb102817dd588b0357cabca (diff) | |
download | gitlab-ce-8c1991b9bb7e3b8d606481fdea316d633cfa5eb7.tar.gz |
Merge branch 'osw-fix-quick-suggestion-application-being-reverted' into 'master'
Adjust applied suggestion reverting previous changes
Closes #56017
See merge request gitlab-org/gitlab-ce!24250
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index a9d1ece0d7e..7206d858dae 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -560,15 +560,19 @@ class MergeRequest < ActiveRecord::Base end def diff_refs - if persisted? - merge_request_diff.diff_refs - else - Gitlab::Diff::DiffRefs.new( - base_sha: diff_base_sha, - start_sha: diff_start_sha, - head_sha: diff_head_sha - ) - end + persisted? ? merge_request_diff.diff_refs : repository_diff_refs + end + + # Instead trying to fetch the + # persisted diff_refs, this method goes + # straight to the repository to get the + # most recent data possible. + def repository_diff_refs + Gitlab::Diff::DiffRefs.new( + base_sha: branch_merge_base_sha, + start_sha: target_branch_sha, + head_sha: source_branch_sha + ) end def branch_merge_base_sha |