diff --git a/app/models/project.rb b/app/models/project.rb index 21f4a18ec4afa65b4f0c8ee664a4cf5c8ff3d5ab..fdf72d3bbd397026a0ef0979b91b1c03da8bf4ff 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1073,7 +1073,7 @@ class Project < ActiveRecord::Base merge_requests.where(source_project_id: self.id) end - def create_repository(force = false) + def create_repository(force: false) # Forked import is handled asynchronously return if forked? && !force @@ -1087,7 +1087,7 @@ class Project < ActiveRecord::Base end def ensure_repository - create_repository(true) unless repository_exists? + create_repository(force: true) unless repository_exists? end def repository_exists? diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 0eeaf68a02a15897149e92ac5aa1426ebb357757..1a56f6f5c593f8b2724afe8f98508a3520b62e5d 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1344,7 +1344,7 @@ describe Project, models: true do .with(project.repository_storage_path, project.path_with_namespace) .and_return(true) - expect(project).to receive(:create_repository) + expect(project).to receive(:create_repository).with(force: true) project.ensure_repository end