Commit 570937d5 authored by Kamil Trzciński's avatar Kamil Trzciński
Browse files

Fix CE to EE merge (backport)

parent 406a1c3d87f9
......@@ -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
......
......@@ -5,7 +5,7 @@ module Git
class Push
include Gitlab::Utils::StrongMemoize
attr_reader :oldrev, :newrev
attr_reader :ref, :oldrev, :newrev
def initialize(project, oldrev, newrev, ref)
@project = project
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment