summaryrefslogtreecommitdiff
path: root/lib/api/v3/triggers.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-02-05 10:04:43 +0000
committerRémy Coutable <remy@rymai.me>2018-02-05 10:04:43 +0000
commit4d64524b0dc26dadc58a01a1696d2198a05e21ee (patch)
tree930429bd79aee23ea3199c9fd146b83551ebdec4 /lib/api/v3/triggers.rb
parent9f5537304bf30bbe7430cc0290df3acea035a428 (diff)
parentcca61980d5ad9c4db65b9498fe49d936657bc0e2 (diff)
downloadgitlab-ce-4d64524b0dc26dadc58a01a1696d2198a05e21ee.tar.gz
Merge branch 'query-counts' into 'master'
Track and act upon the number of executed SQL queries See merge request gitlab-org/gitlab-ce!16466
Diffstat (limited to 'lib/api/v3/triggers.rb')
-rw-r--r--lib/api/v3/triggers.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/v3/triggers.rb b/lib/api/v3/triggers.rb
index 534911fde5c..34f07dfb486 100644
--- a/lib/api/v3/triggers.rb
+++ b/lib/api/v3/triggers.rb
@@ -16,6 +16,8 @@ module API
optional :variables, type: Hash, desc: 'The list of variables to be injected into build'
end
post ":id/(ref/:ref/)trigger/builds", requirements: { ref: /.+/ } do
+ Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42121')
+
# validate variables
params[:variables] = params[:variables].to_h
unless params[:variables].all? { |key, value| key.is_a?(String) && value.is_a?(String) }