summaryrefslogtreecommitdiff
path: root/lib/api/projects.rb
diff options
context:
space:
mode:
authorHan Loong Liauw <hanloongliauw@gmail.com>2015-10-13 21:24:44 +1100
committerHan Loong Liauw <hanloongliauw@gmail.com>2015-10-13 21:42:17 +1100
commitdf99ddbba13db4a7699bf1d585675f921cf382ce (patch)
treea6597628f5c46a553725a121169755f4c0f9cef2 /lib/api/projects.rb
parente12b6f30efef3f607cacc5da51f8c49c3be4643a (diff)
downloadgitlab-ce-df99ddbba13db4a7699bf1d585675f921cf382ce.tar.gz
Adds ability to remove the forked relationship
This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
Diffstat (limited to 'lib/api/projects.rb')
-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 c2fb36b4143..e8a0e7f3ec9 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -247,7 +247,7 @@ module API
# DELETE /projects/:id/fork
delete ":id/fork" do
authenticated_as_admin!
- unless user_project.forked_project_link.nil?
+ if user_project.forked?
user_project.forked_project_link.destroy
end
end