summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2018-01-02 15:16:40 +0100
committerJames Lopez <james@jameslopez.es>2018-01-02 15:16:40 +0100
commit3faa988eb8a3098d05045c554ff7540fa5ab29bf (patch)
treebb3b3b3f12f77679af9748dd8734f0a1c89a9de7
parent54f00b74873f7d24fbb6125b0f35fca38fe033b7 (diff)
downloadgitlab-ce-3faa988eb8a3098d05045c554ff7540fa5ab29bf.tar.gz
fix branch complexity
-rw-r--r--app/services/projects/create_service.rb16
1 files changed, 11 insertions, 5 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index b32bbd56529..6dd51cc2bef 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -57,11 +57,7 @@ module Projects
after_create_actions if @project.persisted?
- if @project.errors.empty?
- @project.import_schedule if @project.import? && !@skip_import
- else
- fail(error: @project.errors.full_messages.join(', '))
- end
+ import_schedule
@project
rescue ActiveRecord::RecordInvalid => e
@@ -165,5 +161,15 @@ module Projects
@project.path = @project.name.dup.parameterize
end
end
+
+ private
+
+ def import_schedule
+ if @project.errors.empty?
+ @project.import_schedule if @project.import? && !@skip_import
+ else
+ fail(error: @project.errors.full_messages.join(', '))
+ end
+ end
end
end