diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-30 16:49:22 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-30 16:49:22 +0100 |
| commit | 4d2d744ae9a2d4c3bb0f00805c27704b79e00d72 (patch) | |
| tree | 839b1c3ab4c09c80f7d643fe69dae8a83c4e4eb4 /lib/api/triggers.rb | |
| parent | 25a3b7fab905d09f6f064108f457a4e20c8915ff (diff) | |
| parent | f7c8434c7100c3c87eb2a75cd5a128e520d8c110 (diff) | |
| download | gitlab-ce-enable-new-navigaton-by-default.tar.gz | |
Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-default
Diffstat (limited to 'lib/api/triggers.rb')
| -rw-r--r-- | lib/api/triggers.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb index edfdb63d183..c9fee7e5193 100644 --- a/lib/api/triggers.rb +++ b/lib/api/triggers.rb @@ -140,8 +140,7 @@ module API trigger = user_project.triggers.find(params.delete(:trigger_id)) return not_found!('Trigger') unless trigger - status 204 - trigger.destroy + destroy_conditionally!(trigger) end end end |