diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-12-04 14:31:15 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-12-04 14:31:15 +0300 |
| commit | 50eb125282ba83e71447161ee2add396fa5eef9b (patch) | |
| tree | 55352ccc9470cf397ffe6efdc85db3f5432e6068 /app/models | |
| parent | ae1c0c4e759abdb534bf2b029769f698667ae2a6 (diff) | |
| parent | 327a9898a226a098b18e80e4950702064ecd38f1 (diff) | |
Merge branch '40711-fix-forking-hashed-projects' into 'master'
Fix the fork project functionality for projects with hashed storage
Closes #40711
See merge request gitlab-org/gitlab-ce!15671
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index eaf4f555d3b..f9c82029912 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -562,8 +562,7 @@ class Project < ActiveRecord::Base if forked? RepositoryForkWorker.perform_async(id, forked_from_project.repository_storage_path, - forked_from_project.full_path, - self.namespace.full_path) + forked_from_project.disk_path) else RepositoryImportWorker.perform_async(self.id) end |