diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-28 12:30:41 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-28 12:30:41 +0000 |
| commit | a69aa3dad51d5e881b3c92f3ac09c689edc00ab3 (patch) | |
| tree | 8617787330de85e2ec62a59b190bed5813e4cf35 /lib/api/files.rb | |
| parent | 71fbbc9da428268411c5a3cef319f7537b63d199 (diff) | |
| parent | 2b8005ae41e7bd29010d54fe8a2c03c7e58b5c66 (diff) | |
| download | gitlab-ce-a69aa3dad51d5e881b3c92f3ac09c689edc00ab3.tar.gz | |
Merge branch 'api-empty-return' into 'master'
Return 204 on all DELETE endpoints
Closes #20429
See merge request !9397
Diffstat (limited to 'lib/api/files.rb')
| -rw-r--r-- | lib/api/files.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index 500f9d3c787..9c4e43d77cc 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -118,10 +118,7 @@ module API file_params = declared_params(include_missing: false) result = ::Files::DestroyService.new(user_project, current_user, commit_params(file_params)).execute - if result[:status] == :success - status(200) - commit_response(file_params) - else + if result[:status] != :success render_api_error!(result[:message], 400) end end |