diff --git a/app/services/git/branch_push_service.rb b/app/services/git/branch_push_service.rb index 464d79d99911ca5dc564af0af14e4c957fdfdc39..d8c88953ee9ca1661a20b8a755d6c2d2f21217ac 100644 --- a/app/services/git/branch_push_service.rb +++ b/app/services/git/branch_push_service.rb @@ -45,7 +45,7 @@ def enqueue_update_mrs oldrev, newrev, ref, - params.slice(:push_options).deep_stringify_keys + params.slice(:push_options, :gitaly_context).deep_stringify_keys ) end diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb index 641e560487eedd3edcd8657f040fd9a78978b29e..90a0355edc7052f9c97399d11570069789542cb7 100644 --- a/spec/services/git/branch_push_service_spec.rb +++ b/spec/services/git/branch_push_service_spec.rb @@ -146,7 +146,7 @@ it "when pushing a new branch for the first time" do expect(UpdateMergeRequestsWorker) .to receive(:perform_async) - .with(project.id, user.id, blankrev, newrev, ref, { 'push_options' => nil }) + .with(project.id, user.id, blankrev, newrev, ref, { 'push_options' => nil, 'gitaly_context' => nil }) .ordered subject diff --git a/spec/services/git/process_ref_changes_service_spec.rb b/spec/services/git/process_ref_changes_service_spec.rb index 05e24cc329a36ec77447379c0ae7f6899b4caa6d..0a7b1a1a40fef0c87f140dc3fffd20bc42dbfefd 100644 --- a/spec/services/git/process_ref_changes_service_spec.rb +++ b/spec/services/git/process_ref_changes_service_spec.rb @@ -287,7 +287,7 @@ def multiple_changes(change, count) Gitlab::Git::SHA1_BLANK_SHA, '789012', "#{ref_prefix}/create1", - { 'push_options' => nil }).ordered + { 'gitaly_context' => nil, 'push_options' => nil }).ordered expect(UpdateMergeRequestsWorker).to receive(:perform_async).with( project.id, @@ -295,7 +295,7 @@ def multiple_changes(change, count) Gitlab::Git::SHA1_BLANK_SHA, '789013', "#{ref_prefix}/create2", - { 'push_options' => nil }).ordered + { 'gitaly_context' => nil, 'push_options' => nil }).ordered expect(UpdateMergeRequestsWorker).to receive(:perform_async).with( project.id, @@ -303,7 +303,7 @@ def multiple_changes(change, count) '789015', '789016', "#{ref_prefix}/changed1", - { 'push_options' => nil }).ordered + { 'gitaly_context' => nil, 'push_options' => nil }).ordered expect(UpdateMergeRequestsWorker).to receive(:perform_async).with( project.id, @@ -311,7 +311,7 @@ def multiple_changes(change, count) '789020', Gitlab::Git::SHA1_BLANK_SHA, "#{ref_prefix}/removed2", - { 'push_options' => nil }).ordered + { 'gitaly_context' => nil, 'push_options' => nil }).ordered subject.execute end