diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-12 16:22:26 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-12 16:22:26 +0300 |
| commit | 4bc58ca210d8c984c20e88c19e74b53e9505905b (patch) | |
| tree | 98e909c4078a4a2374fe4fe45ceb68c27c0bbd77 /lib/gitlab/diff | |
| parent | cd7b75ddf63fcf0510dea9c3eefc602127540b9b (diff) | |
| parent | 5174e99aa288c1bea2b2f65104aa37f7f1fc794e (diff) | |
Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'
Avoid re-fetching merge-base SHA from Gitaly unnecessarily
See merge request gitlab-org/gitlab-ce!17630
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/diff_refs.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/diff/diff_refs.rb b/lib/gitlab/diff/diff_refs.rb index 88e0db830f6..81df47964be 100644 --- a/lib/gitlab/diff/diff_refs.rb +++ b/lib/gitlab/diff/diff_refs.rb @@ -44,7 +44,11 @@ module Gitlab project.commit(head_sha) else straight = start_sha == base_sha - CompareService.new(project, head_sha).execute(project, start_sha, straight: straight) + + CompareService.new(project, head_sha).execute(project, + start_sha, + base_sha: base_sha, + straight: straight) end end end |