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
8eb67187
Commit
8eb67187
authored
May 13, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed transaction stuff
parent
491a3127
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
imports_controller.rb
app/controllers/projects/imports_controller.rb
+0
-2
create_service.rb
app/services/projects/create_service.rb
+1
-7
No files found.
app/controllers/projects/imports_controller.rb
View file @
8eb67187
...
@@ -19,9 +19,7 @@ class Projects::ImportsController < Projects::ApplicationController
...
@@ -19,9 +19,7 @@ class Projects::ImportsController < Projects::ApplicationController
if
@project
.
import_failed?
if
@project
.
import_failed?
@project
.
import_retry
@project
.
import_retry
else
else
Project
.
transaction
do
@project
.
import_start
@project
.
import_start
end
@project
.
add_import_job
@project
.
add_import_job
end
end
end
end
...
...
app/services/projects/create_service.rb
View file @
8eb67187
...
@@ -52,7 +52,7 @@ module Projects
...
@@ -52,7 +52,7 @@ module Projects
save_project_and_import_data
(
import_data
)
save_project_and_import_data
(
import_data
)
start_impo
rt
if
@project
.
import?
@project
.
import_sta
rt
if
@project
.
import?
after_create_actions
if
@project
.
persisted?
after_create_actions
if
@project
.
persisted?
...
@@ -94,12 +94,6 @@ module Projects
...
@@ -94,12 +94,6 @@ module Projects
end
end
end
end
def
start_import
Project
.
transaction
do
@project
.
import_start
end
end
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
...
...
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