Whitelist query limits for internal API
When creating a merge request for push options, there may be over 100 queries that are run to create a merge request. Even after we reduce the number of queries by disabling the Sidekiq jobs, it appears we still hover near this limit. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11450
This commit is contained in:
parent
3a36c08bdd
commit
0595c6d5cd
2 changed files with 5 additions and 1 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue