diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index a6708cf48ac..241e7e60dd2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1074,21 +1074,21 @@ class Project < ActiveRecord::Base merge_requests.where(source_project_id: self.id) end - def create_repository + def create_repository(force: false) # Forked import is handled asynchronously - unless forked? - if gitlab_shell.add_repository(repository_storage_path, path_with_namespace) - repository.after_create - true - else - errors.add(:base, 'Failed to create repository via gitlab-shell') - false - end + return if forked? && !force + + if gitlab_shell.add_repository(repository_storage_path, path_with_namespace) + repository.after_create + true + else + errors.add(:base, 'Failed to create repository via gitlab-shell') + false end end def ensure_repository - create_repository unless repository_exists? + create_repository(force: true) unless repository_exists? end def repository_exists? |