fixup! NXD Teach GitLab about patches

commit_with_hooks was replaced by GitOperationService: see https://gitlab.com/gitlab-org/gitlab-ce/commit/a52dc7cec70ef97b2755fb9cef7d6b489062310c

app/models/repository.rb

@@ -974,7 +974,7 @@ class Repository
 
       # for last patch make sure to update ref and invoke hooks
       else
-        res = commit_with_hooks(user, target_branch) do |ref|
+        res = GitOperationService.new(user, self).with_branch(target_branch) do |ref|
           commit_options["update_ref"] = ref
           Rugged::Commit.create(rugged, commit_options)
         end

app/services/merge_requests/merge_service.rb

@@ -55,7 +55,7 @@ module MergeRequests
       options[:message] = mr_message  if do_merge || (do_apply && merge_request.commits.size == 1)
 
       commit_id = do_merge \
-        ? repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options)
+        ? repository.merge(current_user, source, merge_request, options)
         : repository.apply_patches(current_user, merge_request.commits.reverse, merge_request.target_branch, options)
 
       if commit_id