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
iv
gitlab-ce
Commits
b2b7b38c
Commit
b2b7b38c
authored
May 12, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix rubocop warnings
parent
cffae0d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/import_export/error.rb
lib/gitlab/import_export/error.rb
+1
-1
lib/gitlab/import_export/import_export_reader.rb
lib/gitlab/import_export/import_export_reader.rb
+1
-1
No files found.
lib/gitlab/import_export/error.rb
View file @
b2b7b38c
...
@@ -2,4 +2,4 @@ module Gitlab
...
@@ -2,4 +2,4 @@ module Gitlab
module
ImportExport
module
ImportExport
class
Error
<
StandardError
;
end
class
Error
<
StandardError
;
end
end
end
end
end
\ No newline at end of file
lib/gitlab/import_export/import_export_reader.rb
View file @
b2b7b38c
...
@@ -53,7 +53,7 @@ module Gitlab
...
@@ -53,7 +53,7 @@ module Gitlab
parsed_hash
=
{
include:
value
}
parsed_hash
=
{
include:
value
}
@attributes_parser
.
parse
(
value
)
do
|
hash
|
@attributes_parser
.
parse
(
value
)
do
|
hash
|
parsed_hash
=
{
include:
hash_or_merge
(
value
,
hash
)
}
parsed_hash
=
{
include:
hash_or_merge
(
value
,
hash
)
}
end
end
@json_config_hash
[
current_key
]
=
parsed_hash
@json_config_hash
[
current_key
]
=
parsed_hash
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