Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-11-08 15:59:48 +0300
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-11-09 16:44:20 +0300
commitebd51744729cb1b68754f8ba4d7f9adcec28d58d (patch)
treeff5cc2755ec46060dc83316c484471a3c61cd9f8 /app/controllers
parent78ea074f42543ef352d497f84dba69c6955d843f (diff)
Handle forks in Gitlab::Checks::LfsIntegrity
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/concerns/lfs_request.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/app/controllers/concerns/lfs_request.rb b/app/controllers/concerns/lfs_request.rb
index 738afd612f0..0e3e996711b 100644
--- a/app/controllers/concerns/lfs_request.rb
+++ b/app/controllers/concerns/lfs_request.rb
@@ -91,15 +91,7 @@ module LfsRequest
end
def storage_project
- @storage_project ||= begin
- result = project
-
- # 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
- end
+ @storage_project ||= project.lfs_storage_project
end
def objects