diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
| commit | e4008bc415c112db6b2200fb9c79431ad4ffbecc (patch) | |
| tree | ecedd7a4db93e1cdcebfed0c9afa194fbee30078 /lib/api | |
| parent | a321404fde85fba6b09cbf1a56914f3a2ae555e4 (diff) | |
| parent | befff6827a2cf81f6565b99212652a70139aa2b6 (diff) | |
| download | gitlab-ce-git-archive-improvements-2.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-improvements-2git-archive-improvements-2
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 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 |