summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-10 16:54:16 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-10 16:54:16 +0000
commit4ccba6bf2ddd48d66cd9cd8c6cee5eae19691cbb (patch)
tree50cddab4282aa585e9aef354d7f18f84b8470e4c /lib
parentae63f152c3b1135500577e0b7e6528c607ebc1f7 (diff)
parent4955a47cb1c52168114364e45a2fccf6bc105452 (diff)
downloadgitlab-ce-4ccba6bf2ddd48d66cd9cd8c6cee5eae19691cbb.tar.gz
Merge branch 'clean-up-project-destroy' into 'master'
Clean up project destruction Instead of redirecting from the project service to the service and back to the model, put all destruction code in the service. Also removes a possible source of failure where run_after_commit may not destroy the project. See merge request !5695
Diffstat (limited to 'lib')
-rw-r--r--lib/api/projects.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 8fed7db8803..60cfc103afd 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -323,7 +323,7 @@ module API
# DELETE /projects/:id
delete ":id" do
authorize! :remove_project, user_project
- ::Projects::DestroyService.new(user_project, current_user, {}).pending_delete!
+ ::Projects::DestroyService.new(user_project, current_user, {}).async_execute
end
# Mark this project as forked from another