summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-10-17 16:02:32 -0700
committerStan Hu <stanhu@gmail.com>2017-10-17 16:02:32 -0700
commit891a9ce8b0839fb478ca5704022b2e921097fe27 (patch)
treeec314e86f62f046cb96650be6d076276f23ff453 /app/services
parentbd46c8abfd5ee964c47eff0ace021e45cbbe6687 (diff)
parentb3f749036ea919de3982c81b157ab2d790ecb4c5 (diff)
downloadgitlab-ce-891a9ce8b0839fb478ca5704022b2e921097fe27.tar.gz
Merge branch 'master' into sh-security-fix-backports-master
Diffstat (limited to 'app/services')
-rw-r--r--app/services/projects/unlink_fork_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/unlink_fork_service.rb b/app/services/projects/unlink_fork_service.rb
index abe414d0c05..2b82e5732e4 100644
--- a/app/services/projects/unlink_fork_service.rb
+++ b/app/services/projects/unlink_fork_service.rb
@@ -15,8 +15,8 @@ module Projects
refresh_forks_count(@project.forked_from_project)
- @project.forked_project_link.destroy
@project.fork_network_member.destroy
+ @project.forked_project_link.destroy
end
def refresh_forks_count(project)