summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-08 16:18:18 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-08 16:18:18 +0100
commitf39ff54290abe224b0b79accc0da48c1cd2d2109 (patch)
tree303854f6a649364c539e72fd6665bdca3530540f /lib
parentb2b548de9d74b01816baca822d39f9dd543bbbf7 (diff)
parent792f2bbe0b306bda266dfc817edf33b4c9e36a0f (diff)
downloadgitlab-ce-f39ff54290abe224b0b79accc0da48c1cd2d2109.tar.gz
Merge branch 'master' into zj/gitlab-ce-merge-if-green
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/lfs/response.rb2
1 files changed, 1 insertions, 1 deletions
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