diff options
| author | James Lopez <james@jameslopez.es> | 2016-02-01 15:49:03 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-02-01 15:49:03 +0100 |
| commit | 850942ceba1e9f6918c1234e9b72c261af86de82 (patch) | |
| tree | 1d38d963657cf7fd559431e2e62962f8c95db8ac /lib/api | |
| parent | 927ab48101d44976e174b13323d085aa5f846155 (diff) | |
| parent | da8e0f86595299740a344309cb5963854b61c4a6 (diff) | |
| download | gitlab-ce-850942ceba1e9f6918c1234e9b72c261af86de82.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue
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 |