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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
11d786e7
Commit
11d786e7
authored
Oct 03, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use try instead of ternary operator on Gitlab::ImportExport::ProjectTreeRestorer
parent
9629bb96
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+1
-2
No files found.
lib/gitlab/import_export/project_tree_restorer.rb
View file @
11d786e7
...
@@ -120,8 +120,7 @@ module Gitlab
...
@@ -120,8 +120,7 @@ module Gitlab
end
end
def
parsed_relation_hash
(
relation_hash
)
def
parsed_relation_hash
(
relation_hash
)
group_id
=
restored_project
.
group
?
restored_project
.
group
.
id
:
nil
relation_hash
.
merge!
(
'group_id'
=>
restored_project
.
group
.
try
(
:id
),
'project_id'
=>
restored_project
.
id
)
relation_hash
.
merge!
(
'group_id'
=>
group_id
,
'project_id'
=>
restored_project
.
id
)
end
end
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