diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 14:19:52 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 14:19:52 +0000 |
| commit | 51ed5225adf4aac3ccbf715f8647258dac784abb (patch) | |
| tree | 16137752ed3ea1ffd8c5398ceb131868dc2105d1 /lib | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| parent | 6245be083d985df3dd5daebb78ecf300bacff7b6 (diff) | |
| download | gitlab-ce-51ed5225adf4aac3ccbf715f8647258dac784abb.tar.gz | |
Merge branch 'serve_lfs_object' into 'master'
Serve LFS object
Depends on gitlab-org/gitlab_git!57
See merge request !1976
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/lfs/response.rb | 2 |
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 |