diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-10 17:53:42 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-10 17:53:42 +0200 |
| commit | 741fb49378abbf66fbd8d6ad27b94f1040bf3123 (patch) | |
| tree | 6bc2393e7fd3d8733e0ef8a19c98bd16d2b4fdbd /app/models/namespace.rb | |
| parent | e678f312923faf9a702e19894175d4cb14f66b5b (diff) | |
| parent | 9ac5338b8eb361927ad068486398b92acb0c287e (diff) | |
| download | gitlab-ce-741fb49378abbf66fbd8d6ad27b94f1040bf3123.tar.gz | |
Merge branch 'master' into bvl-group-trees
Diffstat (limited to 'app/models/namespace.rb')
| -rw-r--r-- | app/models/namespace.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index a6f517ce2ce..0601a61a926 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -139,7 +139,9 @@ class Namespace < ActiveRecord::Base end def find_fork_of(project) - projects.joins(:forked_project_link).find_by('forked_project_links.forked_from_project_id = ?', project.id) + return nil unless project.fork_network + + project.fork_network.find_forks_in(projects).first end def lfs_enabled? |