diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-21 11:36:41 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-21 11:36:41 +0200 |
| commit | de0acf3cf7f27e7a4f32dc8cad6293f823eda300 (patch) | |
| tree | 4f5810004fd2f23d5491116ca4f919efea88ee88 /lib/api/projects.rb | |
| parent | 9c2214f202e98d0427d86a57888574327a6607dd (diff) | |
| parent | d25b50fda63e830cb2c87281bba064b71185e712 (diff) | |
| download | gitlab-ce-de0acf3cf7f27e7a4f32dc8cad6293f823eda300.tar.gz | |
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'lib/api/projects.rb')
| -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 c2fb36b4143..67ee66a2058 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -246,8 +246,8 @@ module API # Example Request: # DELETE /projects/:id/fork delete ":id/fork" do - authenticated_as_admin! - unless user_project.forked_project_link.nil? + authorize! :remove_fork_project, user_project + if user_project.forked? user_project.forked_project_link.destroy end end |