diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2017-03-01 14:35:48 +0100 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2017-08-28 16:40:25 +0200 |
| commit | 998afa5f74558be215a924d95aa131a69831ca43 (patch) | |
| tree | 500c242e2bacd966b3faf1a019f28edff2ee24d7 /lib/api/merge_requests.rb | |
| parent | 7ccef75a26bc4997e04c109007e6c6ee004574cb (diff) | |
| download | gitlab-ce-998afa5f74558be215a924d95aa131a69831ca43.tar.gz | |
API: Respect the 'If-Unmodified-Since' for delete endpoints
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 8810d4e441d..c6fecc1aa6c 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -164,6 +164,8 @@ module API merge_request = find_project_merge_request(params[:merge_request_iid]) authorize!(:destroy_merge_request, merge_request) + check_unmodified_since(merge_request.updated_at) + status 204 merge_request.destroy end |