summaryrefslogtreecommitdiff
path: root/app/services/projects/create_service.rb
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-12-22 17:21:13 +0100
committerJames Lopez <james@jameslopez.es>2018-01-02 10:42:18 +0100
commit02276f7a70466f08bef2c233b321bee00727b8c2 (patch)
tree995c8f463435d1519f5b2ba519be4d9a19c7cf3c /app/services/projects/create_service.rb
parentac35636f4ad92a2f3080af556ad8cfadf73ce977 (diff)
downloadgitlab-ce-02276f7a70466f08bef2c233b321bee00727b8c2.tar.gz
Fix import scheduled on bare repo import
Diffstat (limited to 'app/services/projects/create_service.rb')
-rw-r--r--app/services/projects/create_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 71533da31b1..b32bbd56529 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -12,6 +12,7 @@ module Projects
forked_from_project_id = params.delete(:forked_from_project_id)
import_data = params.delete(:import_data)
@skip_wiki = params.delete(:skip_wiki)
+ @skip_import = params.delete(:skip_import)
@project = Project.new(params)
@@ -57,7 +58,7 @@ module Projects
after_create_actions if @project.persisted?
if @project.errors.empty?
- @project.import_schedule if @project.import?
+ @project.import_schedule if @project.import? && !@skip_import
else
fail(error: @project.errors.full_messages.join(', '))
end