Commit 84c7b518 authored by James Lopez's avatar James Lopez

Merge branches 'feature/project-export' and 'feature/project-import' of...

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
parents 1ff77359 773c39cc
...@@ -41,7 +41,7 @@ module Gitlab ...@@ -41,7 +41,7 @@ module Gitlab
current_key = hash.keys.first current_key = hash.keys.first
value = process_current_class(hash, included_classes_hash, value) value = process_current_class(hash, included_classes_hash, value)
if included_classes_hash[current_key] if included_classes_hash[current_key]
add_class(current_key, included_classes_hash, value) add_to_class(current_key, included_classes_hash, value)
else else
add_new_class(current_key, included_classes_hash, value) add_new_class(current_key, included_classes_hash, value)
end end
...@@ -58,13 +58,18 @@ module Gitlab ...@@ -58,13 +58,18 @@ module Gitlab
def add_new_class(current_key, included_classes_hash, value) def add_new_class(current_key, included_classes_hash, value)
only_except_hash = check_only_and_except(value) only_except_hash = check_only_and_except(value)
# TODO: refactor this parsed_hash = { include: value }
value = (value.is_a?(Hash) ? value.merge(only_except_hash) : { value => only_except_hash }) if only_except_hash unless only_except_hash.empty?
new_hash = { include: value } if value.is_a?(Hash)
included_classes_hash[current_key] = new_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 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) only_except_hash = check_only_and_except(value)
value = { value => only_except_hash } unless only_except_hash.empty? value = { value => only_except_hash } unless only_except_hash.empty?
old_values = included_classes_hash[current_key][:include] old_values = included_classes_hash[current_key][:include]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment