Commit 9f867818 authored by Robert Speicher's avatar Robert Speicher

Resolve lib/api/triggers.rb

parent c8fe3fae
......@@ -10,13 +10,8 @@ module API
success Entities::Pipeline
end
params do
<<<<<<< HEAD
requires :ref, type: String, desc: 'The commit sha or name of a branch or tag'
requires :token, type: String, desc: 'The unique token of trigger or job token'
=======
requires :ref, type: String, desc: 'The commit sha or name of a branch or tag', allow_blank: false
requires :token, type: String, desc: 'The unique token of trigger'
>>>>>>> upstream/master
requires :token, type: String, desc: 'The unique token of trigger or job token'
optional :variables, type: Hash, desc: 'The list of variables to be injected into build'
end
post ":id/(ref/:ref/)trigger/pipeline", requirements: { ref: /.+/ } do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment