Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
cacbecd0
Commit
cacbecd0
authored
May 12, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more changes based on MR feedback
parent
f27d7b2c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/controllers/projects/imports_controller.rb
app/controllers/projects/imports_controller.rb
+1
-1
app/services/projects/create_service.rb
app/services/projects/create_service.rb
+1
-2
No files found.
app/controllers/projects/imports_controller.rb
View file @
cacbecd0
...
@@ -22,7 +22,7 @@ class Projects::ImportsController < Projects::ApplicationController
...
@@ -22,7 +22,7 @@ class Projects::ImportsController < Projects::ApplicationController
Project
.
transaction
do
Project
.
transaction
do
@project
.
import_start
@project
.
import_start
end
end
@project
.
add_import_job
if
@project
.
persisted?
@project
.
add_import_job
end
end
end
end
...
...
app/services/projects/create_service.rb
View file @
cacbecd0
...
@@ -103,9 +103,8 @@ module Projects
...
@@ -103,9 +103,8 @@ module Projects
def
save_project_and_import_data
(
import_data
)
def
save_project_and_import_data
(
import_data
)
Project
.
transaction
do
Project
.
transaction
do
@project
.
create_or_update_import_data
(
data:
import_data
[
:data
],
credentials:
import_data
[
:credentials
])
if
import_data
@project
.
create_or_update_import_data
(
data:
import_data
[
:data
],
credentials:
import_data
[
:credentials
])
if
import_data
@project
.
save
if
@project
.
persisted?
&&
!
@project
.
import?
if
@project
.
save
&&
!
@project
.
import?
raise
'Failed to create repository'
unless
@project
.
create_repository
raise
'Failed to create repository'
unless
@project
.
create_repository
end
end
end
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