kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

This commit is contained in:
James Lopez 2016-05-04 15:14:43 +02:00
parent 1ff7735906 773c39cca3
commit 84c7b5185d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/gitlab/import_export/import_export_reader.rb
View File

@ -41,7 +41,7 @@ module Gitlab
current_key = hash.keys.first
value = process_current_class(hash, included_classes_hash, value)
if included_classes_hash[current_key]
add_class(current_key, included_classes_hash, value)
add_to_class(current_key, included_classes_hash, value)
else
add_new_class(current_key, included_classes_hash, value)
end
@ -58,13 +58,18 @@ module Gitlab
def add_new_class(current_key, included_classes_hash, value)
only_except_hash = check_only_and_except(value)
# TODO: refactor this
value = (value.is_a?(Hash) ? value.merge(only_except_hash) : { value => only_except_hash }) if only_except_hash
new_hash = { include: value }
included_classes_hash[current_key] = new_hash
parsed_hash = { include: value }
unless only_except_hash.empty?
if value.is_a?(Hash)
parsed_hash = { include: value.merge(only_except_hash) }
else
parsed_hash = { include: { value => only_except_hash } }
end
end
included_classes_hash[current_key] = parsed_hash
end
def add_class(current_key, included_classes_hash, value)
def add_to_class(current_key, included_classes_hash, value)
only_except_hash = check_only_and_except(value)
value = { value => only_except_hash } unless only_except_hash.empty?
old_values = included_classes_hash[current_key][:include]