diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-06 11:53:08 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-06 11:53:08 +0000 |
| commit | bedd5769e936fecc528a2bde49f48dea3966cd1f (patch) | |
| tree | 1632614a9a252eadf5a2ebecd43b6757abefa4e7 | |
| parent | 1239629cd747e8f1eeae61174ff1b7d5b08359b9 (diff) | |
| parent | 9f9cac67ab7292be0037082120f0995152624599 (diff) | |
| download | gitlab-ce-bedd5769e936fecc528a2bde49f48dea3966cd1f.tar.gz | |
Merge branch 'backport-ce-to-ee-merge' into 'master'
Backport of CE upstream - 2018-10-05 12:21 UTC
See merge request gitlab-org/gitlab-ce!22154
| -rw-r--r-- | app/services/merge_requests/refresh_service.rb | 11 | ||||
| -rw-r--r-- | lib/gitlab/git/push.rb | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index d3e4f3def23..b03d14fa3cc 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -3,16 +3,17 @@ module MergeRequests class RefreshService < MergeRequests::BaseService def execute(oldrev, newrev, ref) - @push = Gitlab::Git::Push.new(@project, oldrev, newrev, ref) + push = Gitlab::Git::Push.new(@project, oldrev, newrev, ref) + return true unless push.branch_push? - return true unless @push.branch_push? - - refresh_merge_requests! + refresh_merge_requests!(push) end private - def refresh_merge_requests! + def refresh_merge_requests!(push) + @push = push + Gitlab::GitalyClient.allow_n_plus_1_calls(&method(:find_new_commits)) # Be sure to close outstanding MRs before reloading them to avoid generating an # empty diff during a manual merge diff --git a/lib/gitlab/git/push.rb b/lib/gitlab/git/push.rb index 7c1309721fd..b6577ba17f1 100644 --- a/lib/gitlab/git/push.rb +++ b/lib/gitlab/git/push.rb @@ -5,7 +5,7 @@ module Gitlab class Push include Gitlab::Utils::StrongMemoize - attr_reader :oldrev, :newrev + attr_reader :ref, :oldrev, :newrev def initialize(project, oldrev, newrev, ref) @project = project |