diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-17 16:33:30 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-17 16:46:07 +0200 |
| commit | 2c0b677604e438b9bf608e6ea17b47e5640b4700 (patch) | |
| tree | 5b2fd56ea9796af05980ad9ea754f16cf41e53f7 /app/services/projects/unlink_fork_service.rb | |
| parent | f69b54682fc1770a73c528032b1a86f3e7d547a1 (diff) | |
| download | gitlab-ce-2c0b677604e438b9bf608e6ea17b47e5640b4700.tar.gz | |
Fix errors when deleting a forked project
The problem would occur when the `ForkedProjectLink` was deleted, but
the `ForkNetworkMember` was not. The delete would be rolled back and
retried.
But the error would not be saved because `Project#forked?`
would still be true, because the `ForkNetworkMember` exists. But the
`Project#forked_project_link` would be `nil`. So the validation for
the visibility level would fail.
Diffstat (limited to 'app/services/projects/unlink_fork_service.rb')
| -rw-r--r-- | app/services/projects/unlink_fork_service.rb | 2 |
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) |