diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-21 09:09:48 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-21 09:09:48 +0000 |
| commit | c740047b50f3dc2c93a296a69a8ecdf70a8ef4fc (patch) | |
| tree | d3e0b1bb81ae1416859c8e95f09fc4bccacb81a9 /lib/api/triggers.rb | |
| parent | 5d400cc6d3249f4e2355f7bf3be1b39bf4ceaacf (diff) | |
| parent | 2025f361e7520e00962f6964aa77c4f4e6c3d56b (diff) | |
| download | gitlab-ce-c740047b50f3dc2c93a296a69a8ecdf70a8ef4fc.tar.gz | |
Merge branch 'master' into notebook-multiple-outputs
Diffstat (limited to 'lib/api/triggers.rb')
| -rw-r--r-- | lib/api/triggers.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb index dd6801664b1..b3709455bc3 100644 --- a/lib/api/triggers.rb +++ b/lib/api/triggers.rb @@ -15,6 +15,8 @@ module API optional :variables, type: Hash, desc: 'The list of variables to be injected into build' end post ":id/(ref/:ref/)trigger/pipeline", requirements: { ref: /.+/ } do + Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42283') + # validate variables params[:variables] = params[:variables].to_h unless params[:variables].all? { |key, value| key.is_a?(String) && value.is_a?(String) } |