diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-22 22:54:24 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-22 22:54:24 +0000 |
| commit | 4bf2fded92e05420e6d103c8df63d6d83198a684 (patch) | |
| tree | e71cd5818fb957d0d5583d30d851538a6d6f2e61 /app/models/project.rb | |
| parent | 9c5ba799966bab0a26d49e8a777359d3e85a7dcc (diff) | |
| parent | 2c1d7c09483948f764693f30cc070671a93f789f (diff) | |
| download | gitlab-ce-4bf2fded92e05420e6d103c8df63d6d83198a684.tar.gz | |
Merge branch '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master'
Resolve "Cannot change project visibility from Private (even when owner)"
Closes #40612
See merge request gitlab-org/gitlab-ce!16595
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index c0f7b30ceb0..0570bbc8ee3 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1032,6 +1032,8 @@ class Project < ActiveRecord::Base end def fork_source + return nil unless forked? + forked_from_project || fork_network&.root_project end |