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
c42f5f8b
Commit
c42f5f8b
authored
Aug 11, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor parse_hash based on feedback
parent
efab1677
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/import_export/json_hash_builder.rb
lib/gitlab/import_export/json_hash_builder.rb
+3
-3
No files found.
lib/gitlab/import_export/json_hash_builder.rb
View file @
c42f5f8b
...
@@ -57,17 +57,17 @@ module Gitlab
...
@@ -57,17 +57,17 @@ module Gitlab
# +value+ existing model to be included in the hash
# +value+ existing model to be included in the hash
# +json_config_hash+ the original hash containing the root model
# +json_config_hash+ the original hash containing the root model
def
create_model_value
(
current_key
,
value
,
json_config_hash
)
def
create_model_value
(
current_key
,
value
,
json_config_hash
)
json_config_hash
[
current_key
]
=
parse_hash
(
value
,
{
include:
value
})
json_config_hash
[
current_key
]
=
parse_hash
(
value
)
||
{
include:
value
}
end
end
# Calls attributes finder to parse the hash and add any attributes to it
# Calls attributes finder to parse the hash and add any attributes to it
#
#
# +value+ existing model to be included in the hash
# +value+ existing model to be included in the hash
# +parsed_hash+ the original hash
# +parsed_hash+ the original hash
def
parse_hash
(
value
,
parsed_hash
)
def
parse_hash
(
value
)
@attributes_finder
.
parse
(
value
)
do
|
hash
|
@attributes_finder
.
parse
(
value
)
do
|
hash
|
{
include:
hash_or_merge
(
value
,
hash
)
}
{
include:
hash_or_merge
(
value
,
hash
)
}
end
||
parsed_hash
end
end
end
# Adds new model configuration to an existing hash with key +current_key+
# Adds new model configuration to an existing hash with key +current_key+
...
...
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