summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorLuke Duncalfe <lduncalfe@eml.cc>2019-05-12 18:47:15 -0500
committerLuke Duncalfe <lduncalfe@eml.cc>2019-05-17 13:47:24 +1200
commit515f3eb44ab6e11c124dc4a7cc34c94e765783d5 (patch)
treef985d5627815cdde365efd9c69d68dbadb3dee0f /spec
parent74511b049743cf543694bb92a8acd7e7586e533d (diff)
downloadgitlab-ce-515f3eb44ab6e11c124dc4a7cc34c94e765783d5.tar.gz
Remove the mr_push_options feature flag
`Gitlab::QueryLimiting.whitelist` has been moved from being inside the feature flag conditional check to the `process_mr_push_options` `Api::Internal` helper. https://gitlab.com/gitlab-org/gitlab-ce/issues/60250
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/internal_spec.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index bae0302f3ff..fcbff19bd61 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -997,18 +997,6 @@ describe API::Internal do
expect(json_response['warnings']).to eq('Error encountered with push options \'merge_request.create\': my error')
end
-
- context 'when the feature is disabled' do
- it 'does not invoke MergeRequests::PushOptionsHandlerService' do
- stub_feature_flags(mr_push_options: false)
-
- expect(MergeRequests::PushOptionsHandlerService).not_to receive(:new)
-
- expect do
- post api('/internal/post_receive'), params: valid_params
- end.not_to change { MergeRequest.count }
- end
- end
end
context 'broadcast message exists' do