Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r--app/services/merge_requests/refresh_service.rb11
1 files changed, 6 insertions, 5 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