diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-30 11:20:34 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-30 11:20:34 +0100 |
| commit | 75c4d2659bbcd51efc44123f3ab2c6496fa0eee2 (patch) | |
| tree | 3b64f1f2d6c532c4472be1ff50662774a3299fa6 /lib/api/environments.rb | |
| parent | a8460f215cc1949b993e774dc00bad0b506abcfa (diff) | |
| parent | 978b4b9cc0374c9cb5680612fe4154f393bbba9c (diff) | |
| download | gitlab-ce-75c4d2659bbcd51efc44123f3ab2c6496fa0eee2.tar.gz | |
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'lib/api/environments.rb')
| -rw-r--r-- | lib/api/environments.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/environments.rb b/lib/api/environments.rb index c774a5c6685..e33269f9483 100644 --- a/lib/api/environments.rb +++ b/lib/api/environments.rb @@ -79,8 +79,7 @@ module API environment = user_project.environments.find(params[:environment_id]) - status 204 - environment.destroy + destroy_conditionally!(environment) end desc 'Stops an existing environment' do |