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
350a9aa9
Commit
350a9aa9
authored
Apr 07, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix create_or_update_import_data
parent
0ceee903
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
project.rb
app/models/project.rb
+4
-1
No files found.
app/models/project.rb
View file @
350a9aa9
...
...
@@ -419,7 +419,10 @@ class Project < ActiveRecord::Base
def
create_or_update_import_data
(
data:
nil
,
credentials:
nil
)
project_import_data
=
import_data
||
build_import_data
project_import_data
.
data
=
data
if
data
if
data
project_import_data
.
data
||=
{}
project_import_data
.
data
=
project_import_data
.
data
.
merge
(
data
)
end
if
credentials
project_import_data
.
credentials
||=
{}
project_import_data
.
credentials
=
project_import_data
.
credentials
.
merge
(
credentials
)
...
...
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