summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-12-04 12:32:13 +0100
committerMarin Jankovski <maxlazio@gmail.com>2015-12-04 12:32:13 +0100
commitb2c4675cb0e681027334e5bd046451d3116924c8 (patch)
treefdd63aa1294aa04f48fa5ff52ad2c7d255b78420
parentb9a0f96d42f52dfdad57ac8a2a5056a9262e6a88 (diff)
downloadgitlab-ce-b2c4675cb0e681027334e5bd046451d3116924c8.tar.gz
Recursivity needed if a fork is a fork of a fork.
-rw-r--r--app/models/lfs_object.rb2
-rw-r--r--lib/gitlab/lfs/response.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb
index 43b845b29c6..a243c7b77cc 100644
--- a/app/models/lfs_object.rb
+++ b/app/models/lfs_object.rb
@@ -8,7 +8,7 @@ class LfsObject < ActiveRecord::Base
def storage_project(project)
if project && project.forked?
- project.forked_from_project
+ storage_project(project.forked_from_project)
else
project
end
diff --git a/lib/gitlab/lfs/response.rb b/lib/gitlab/lfs/response.rb
index 9be9a65671b..9d9617761b3 100644
--- a/lib/gitlab/lfs/response.rb
+++ b/lib/gitlab/lfs/response.rb
@@ -220,7 +220,7 @@ module Gitlab
def storage_project(project)
if project.forked?
- project.forked_from_project
+ storage_project(project.forked_from_project)
else
project
end