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
Jérome Perrin
gitlab-ce
Commits
9e1f8ac2
Commit
9e1f8ac2
authored
Sep 06, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactored code
parent
e5f91e52
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+3
-4
No files found.
lib/gitlab/import_export/project_tree_restorer.rb
View file @
9e1f8ac2
...
@@ -56,8 +56,7 @@ module Gitlab
...
@@ -56,8 +56,7 @@ module Gitlab
if
relation
.
is_a?
(
Hash
)
if
relation
.
is_a?
(
Hash
)
create_sub_relations
(
relation
,
@tree_hash
)
create_sub_relations
(
relation
,
@tree_hash
)
elsif
@tree_hash
[
relation
.
to_s
].
present?
elsif
@tree_hash
[
relation
.
to_s
].
present?
relation_key
=
relation
.
is_a?
(
Hash
)
?
relation
.
keys
.
first
:
relation
save_relation_hash
(
@tree_hash
[
relation
.
to_s
],
relation
)
save_relation_hash
(
@tree_hash
[
relation_key
.
to_s
],
relation_key
)
end
end
end
end
...
@@ -101,7 +100,7 @@ module Gitlab
...
@@ -101,7 +100,7 @@ module Gitlab
# issue, finds any subrelations such as notes, creates them and assign them back to the hash
# issue, finds any subrelations such as notes, creates them and assign them back to the hash
#
#
# Recursively calls this method if the sub-relation is a hash containing more sub-relations
# Recursively calls this method if the sub-relation is a hash containing more sub-relations
def
create_sub_relations
(
relation
,
tree_hash
,
save
=
true
)
def
create_sub_relations
(
relation
,
tree_hash
,
save
:
true
)
relation_key
=
relation
.
keys
.
first
.
to_s
relation_key
=
relation
.
keys
.
first
.
to_s
return
if
tree_hash
[
relation_key
].
blank?
return
if
tree_hash
[
relation_key
].
blank?
...
@@ -133,7 +132,7 @@ module Gitlab
...
@@ -133,7 +132,7 @@ module Gitlab
# We just use author to get the user ID, do not attempt to create an instance.
# We just use author to get the user ID, do not attempt to create an instance.
next
if
sub_relation
==
:author
next
if
sub_relation
==
:author
create_sub_relations
(
sub_relation
,
relation_item
,
false
)
if
sub_relation
.
is_a?
(
Hash
)
create_sub_relations
(
sub_relation
,
relation_item
,
save:
false
)
if
sub_relation
.
is_a?
(
Hash
)
relation_hash
,
sub_relation
=
assign_relation_hash
(
relation_item
,
sub_relation
)
relation_hash
,
sub_relation
=
assign_relation_hash
(
relation_item
,
sub_relation
)
relation_item
[
sub_relation
.
to_s
]
=
create_relation
(
sub_relation
,
relation_hash
)
unless
relation_hash
.
blank?
relation_item
[
sub_relation
.
to_s
]
=
create_relation
(
sub_relation
,
relation_hash
)
unless
relation_hash
.
blank?
...
...
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