diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-30 12:14:48 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-30 12:14:48 +0100 |
| commit | f862b4ae0faee80344faa583c74389c8e57fb7c2 (patch) | |
| tree | 60fba79f2e2ca0c96a23ba0495a5cd04a42a0d19 /lib/api | |
| parent | 3d61cf9f1bfaa9d0ffd5cc36e54162c0f0b59c61 (diff) | |
| parent | f255313ea47b433b428b3b90452aede8c9a6618c (diff) | |
| download | gitlab-ce-f862b4ae0faee80344faa583c74389c8e57fb7c2.tar.gz | |
Merge remote-tracking branch 'origin/background-delete-process'
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/projects.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 71bb342f844..1f991e600e3 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -187,7 +187,7 @@ module API else present @forked_project, with: Entities::Project, user_can_admin_project: can?(current_user, :admin_project, @forked_project) - end + end end # Update an existing project @@ -246,7 +246,7 @@ module API # DELETE /projects/:id delete ":id" do authorize! :remove_project, user_project - ::Projects::DestroyService.new(user_project, current_user, {}).execute + ::Projects::DestroyService.new(user_project, current_user, {}).pending_delete! end # Mark this project as forked from another |