summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-11-03 14:59:47 +0100
committerBob Van Landuyt <bob@vanlanduyt.co>2017-11-03 14:59:47 +0100
commit0f1d6402b9ebf25d5ddd09effe6dce1902ae476b (patch)
tree49bac1361eea22526709bb777c542ce1dd39a851 /app/controllers/concerns
parent7582bc8b4eacfe70ecc575f724285de471d6c743 (diff)
downloadgitlab-ce-0f1d6402b9ebf25d5ddd09effe6dce1902ae476b.tar.gz
Find the LFS-objects for a fork within a the fork network
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/lfs_request.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/concerns/lfs_request.rb b/app/controllers/concerns/lfs_request.rb
index 2b6afaa6233..738afd612f0 100644
--- a/app/controllers/concerns/lfs_request.rb
+++ b/app/controllers/concerns/lfs_request.rb
@@ -94,10 +94,9 @@ module LfsRequest
@storage_project ||= begin
result = project
- loop do
- break unless result.forked?
- result = result.forked_from_project
- end
+ # 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