summaryrefslogtreecommitdiff
path: root/lib/api/projects.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-07-20 16:33:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-07-20 16:33:18 +0300
commit6b8ad689da393125bb2d1e548211c9a50039b0a7 (patch)
treeeb35d412b07e28c58d9cbd017ca357ae16aefef0 /lib/api/projects.rb
parent4766a77b1d44bb6989e6c86a7a7dd10f6983ba4e (diff)
downloadgitlab-ce-6b8ad689da393125bb2d1e548211c9a50039b0a7.tar.gz
Update grape gemdz-update-grape
New version of the gem returns 200 status code on delete with content instead of 204 so we explicitly set status code to keep existing behavior Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/api/projects.rb')
-rw-r--r--lib/api/projects.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index c459257158d..89dda88d3f5 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -361,6 +361,7 @@ module API
authorize! :remove_fork_project, user_project
if user_project.forked?
+ status 204
user_project.forked_project_link.destroy
else
not_modified!
@@ -405,6 +406,7 @@ module API
link = user_project.project_group_links.find_by(group_id: params[:group_id])
not_found!('Group Link') unless link
+ status 204
link.destroy
end