diff options
| author | George Andrinopoulos <geoandri@gmail.com> | 2017-03-20 12:49:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-20 12:49:31 +0000 |
| commit | de518e124746e922fc19541fd8dd6e2c0a36841e (patch) | |
| tree | b1a70adafa94f39c88df82ef2e2ca5726659eb3f /lib/api | |
| parent | 9bfff603fe91f56b0355e102f5d62c8dccc1d9f8 (diff) | |
| download | gitlab-ce-de518e124746e922fc19541fd8dd6e2c0a36841e.tar.gz | |
Allow dot in branch name in trigger/builds endpoint in API
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/triggers.rb | 2 | ||||
| -rw-r--r-- | lib/api/v3/triggers.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb index aa3c9a06ed5..a9f2ca2608e 100644 --- a/lib/api/triggers.rb +++ b/lib/api/triggers.rb @@ -14,7 +14,7 @@ module API requires :token, type: String, desc: 'The unique token of trigger' optional :variables, type: Hash, desc: 'The list of variables to be injected into build' end - post ":id/(ref/:ref/)trigger/pipeline" do + post ":id/(ref/:ref/)trigger/pipeline", requirements: { ref: /.+/ } do project = find_project(params[:id]) trigger = Ci::Trigger.find_by_token(params[:token].to_s) not_found! unless project && trigger diff --git a/lib/api/v3/triggers.rb b/lib/api/v3/triggers.rb index b46639a2205..a23d6b6b48c 100644 --- a/lib/api/v3/triggers.rb +++ b/lib/api/v3/triggers.rb @@ -15,7 +15,7 @@ module API requires :token, type: String, desc: 'The unique token of trigger' optional :variables, type: Hash, desc: 'The list of variables to be injected into build' end - post ":id/(ref/:ref/)trigger/builds" do + post ":id/(ref/:ref/)trigger/builds", requirements: { ref: /.+/ } do project = find_project(params[:id]) trigger = Ci::Trigger.find_by_token(params[:token].to_s) not_found! unless project && trigger |