diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-04 09:20:19 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-04 09:20:19 +0000 |
| commit | c353426650877956bf2db3111f9964f68e5940f6 (patch) | |
| tree | 43ba7e90110e742bd14c8c417254e6e104f497f1 /app/models | |
| parent | 9dd330576ac374cd7ec7e97863e0b5228dfd3205 (diff) | |
| parent | ddfc661f794ca02654853a9e223b9a5f3fb983ab (diff) | |
| download | gitlab-ce-c353426650877956bf2db3111f9964f68e5940f6.tar.gz | |
Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' into 'master'
Use shard name in Git::GitlabProjects instead of shard path
Closes gitaly#1110
See merge request gitlab-org/gitlab-ce!18015
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 3bd0d3445fe..714a15ade9c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -566,9 +566,7 @@ class Project < ActiveRecord::Base def add_import_job job_id = if forked? - RepositoryForkWorker.perform_async(id, - forked_from_project.repository_storage_path, - forked_from_project.disk_path) + RepositoryForkWorker.perform_async(id) elsif gitlab_project_import? # Do not retry on Import/Export until https://gitlab.com/gitlab-org/gitlab-ce/issues/26189 is solved. RepositoryImportWorker.set(retry: false).perform_async(self.id) |