summaryrefslogtreecommitdiff
path: root/lib/api/issues.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-30 09:56:17 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-30 09:56:17 +0000
commitf11049ab9131b78c14e95bd95b3073c1eaf59392 (patch)
tree882c763637a02a386486799c39897bd563c7b6aa /lib/api/issues.rb
parenta16854ff462935f1a967f31abfeb242cf26284cc (diff)
parentee4820a5268d02fb7ed142511d1a194f06629a1e (diff)
downloadgitlab-ce-f11049ab9131b78c14e95bd95b3073c1eaf59392.tar.gz
Merge branch 'api-delete-respect-headers' into 'master'
API: Respect the 'If-Unmodified-Since' for delete endpoints See merge request !9621
Diffstat (limited to 'lib/api/issues.rb')
-rw-r--r--lib/api/issues.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 4cec1145f3a..6503629e2a2 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -230,8 +230,8 @@ module API
not_found!('Issue') unless issue
authorize!(:destroy_issue, issue)
- status 204
- issue.destroy
+
+ destroy_conditionally!(issue)
end
desc 'List merge requests closing issue' do