diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-14 09:48:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-14 09:48:19 +0000 |
| commit | c9515ca541ebaa3ce0a3208ab08eb59c580cbed6 (patch) | |
| tree | 940a4de00c36470ae7910fd7e15dd0338c2d6472 /app/models/project.rb | |
| parent | 58bd04ab75d99fa9be0d9568c442704d400e8b1d (diff) | |
| parent | ebd51744729cb1b68754f8ba4d7f9adcec28d58d (diff) | |
| download | gitlab-ce-c9515ca541ebaa3ce0a3208ab08eb59c580cbed6.tar.gz | |
Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'
Handle forks in Gitlab::Checks::LfsIntegrity
Closes #39902
See merge request gitlab-org/gitlab-ce!15279
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index bae16b6b2af..853f6bc504a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1047,6 +1047,18 @@ class Project < ActiveRecord::Base forked_from_project || fork_network&.root_project end + def lfs_storage_project + @lfs_storage_project ||= begin + result = self + + # TODO: Make this go to the fork_network root immeadiatly + # dependant on the discussion in: https://gitlab.com/gitlab-org/gitlab-ce/issues/39769 + result = result.fork_source while result&.forked? + + result || self + end + end + def personal? !group end |
