refactor project create service41424-gitlab-rake-gitlab-import-repos-schedules-an-import

2 files changed, 3 insertions, 3 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index e37eae9f176..6ebb083aeb4 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -639,7 +639,7 @@ class Project < ActiveRecord::Base
   end
 
   def import?
-    external_import? || forked? || gitlab_project_import?
+    external_import? || forked? || gitlab_project_import? || bare_repository_import?
   end
 
   def no_import?
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 52b90cdf135..dc7b1f1f5cc 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -120,7 +120,7 @@ module Projects
       Project.transaction do
         @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
 
-        if @project.save && !@project.import? && !@project.bare_repository_import?
+        if @project.save && !@project.import?
           raise 'Failed to create repository' unless @project.create_repository
         end
       end
@@ -165,7 +165,7 @@ module Projects
 
     def import_schedule
       if @project.errors.empty?
-        @project.import_schedule if @project.import?
+        @project.import_schedule if @project.import? && !@project.bare_repository_import?
       else
         fail(error: @project.errors.full_messages.join(', '))
       end