Fix CE to EE merge

app/services/merge_requests/refresh_service.rb

@@ -5,16 +5,17 @@ module MergeRequests
     prepend EE::MergeRequests::RefreshService
 
     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

ee/app/services/ee/merge_requests/refresh_service.rb

@@ -5,9 +5,9 @@ module EE
 
       private
 
-      override :do_execute
-      def do_execute(oldrev, newrev, ref)
-        super && reset_approvals_for_merge_requests(ref, newrev)
+      override :refresh_merge_requests!
+      def refresh_merge_requests!(push)
+        super && reset_approvals_for_merge_requests(push.ref, push.newrev)
       end
 
       # Note: Closed merge requests also need approvals reset.

ee/spec/helpers/application_helper_spec.rb

@@ -24,7 +24,7 @@ describe ApplicationHelper do
       let(:noteable_type) { Issue }
 
       it 'returns paths for autocomplete_sources_controller' do
-        expect_autocomplete_data_sources(object, noteable_type, [:members, :issues, :mergeRequests, :labels, :milestones, :commands])
+        expect_autocomplete_data_sources(object, noteable_type, [:members, :issues, :mergeRequests, :labels, :milestones, :commands, :snippets])
       end
     end
   end

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