Merge branch 'sh-whitelist-internal-api' into 'master'

Whitelist query limits for internal API

Closes gitlab-ee#11450

See merge request gitlab-org/gitlab-ce!28037

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 00f0bbab231..c82fd230d7a 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -265,6 +265,8 @@ module API
           params[:changes], push_options.as_json)
 
         if Feature.enabled?(:mr_push_options, default_enabled: true)
+          Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/61359')
+
           mr_options = push_options.get(:merge_request)
           output.merge!(process_mr_push_options(mr_options, project, user, params[:changes])) if mr_options.present?
         end
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index 88c19448373..bae0302f3ff 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -959,7 +959,9 @@ describe API::Internal do
 
       it 'creates a new merge request' do
         expect do
-          post api('/internal/post_receive'), params: valid_params
+          Sidekiq::Testing.fake! do
+            post api('/internal/post_receive'), params: valid_params
+          end
         end.to change { MergeRequest.count }.by(1)
       end