BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
86257cf7
Commit
86257cf7
authored
Jan 03, 2018
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor project create service
parent
80112ca4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
project.rb
app/models/project.rb
+1
-1
create_service.rb
app/services/projects/create_service.rb
+2
-2
No files found.
app/models/project.rb
View file @
86257cf7
...
...
@@ -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?
...
...
app/services/projects/create_service.rb
View file @
86257cf7
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment