diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-24 15:07:34 +1000 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-24 15:07:34 +1000 |
| commit | 1b9c1ac3adb3d65e51f38e37c4705d46c5618f88 (patch) | |
| tree | b724afd0596dd658f7ef7baddf9411ff3e599f7d /lib/api/triggers.rb | |
| parent | 392c411bdc16386ef42c86afaf8c4d8e4cddb955 (diff) | |
| parent | 2e00c1a72afc4b7388bb46bd6d58608e2ae61899 (diff) | |
| download | gitlab-ce-1b9c1ac3adb3d65e51f38e37c4705d46c5618f88.tar.gz | |
Merge branch 'master' into 10244-add-project-ci-cd-settings
Diffstat (limited to 'lib/api/triggers.rb')
| -rw-r--r-- | lib/api/triggers.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb index b3709455bc3..b29e660c6e0 100644 --- a/lib/api/triggers.rb +++ b/lib/api/triggers.rb @@ -62,7 +62,7 @@ module API authorize! :admin_build, user_project trigger = user_project.triggers.find(params.delete(:trigger_id)) - return not_found!('Trigger') unless trigger + break not_found!('Trigger') unless trigger present trigger, with: Entities::Trigger end @@ -99,7 +99,7 @@ module API authorize! :admin_build, user_project trigger = user_project.triggers.find(params.delete(:trigger_id)) - return not_found!('Trigger') unless trigger + break not_found!('Trigger') unless trigger if trigger.update(declared_params(include_missing: false)) present trigger, with: Entities::Trigger @@ -119,7 +119,7 @@ module API authorize! :admin_build, user_project trigger = user_project.triggers.find(params.delete(:trigger_id)) - return not_found!('Trigger') unless trigger + break not_found!('Trigger') unless trigger if trigger.update(owner: current_user) status :ok @@ -140,7 +140,7 @@ module API authorize! :admin_build, user_project trigger = user_project.triggers.find(params.delete(:trigger_id)) - return not_found!('Trigger') unless trigger + break not_found!('Trigger') unless trigger destroy_conditionally!(trigger) end |