Fix attribute inclusion in import/export config ignored in some cases

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/gitlab/import_export/json_hash_builder.rb b/lib/gitlab/import_export/json_hash_builder.rb
index 008300bde45..b7db0e7a06a 100644
--- a/lib/gitlab/import_export/json_hash_builder.rb
+++ b/lib/gitlab/import_export/json_hash_builder.rb
@@ -57,10 +57,7 @@ module Gitlab
       # +value+ existing model to be included in the hash
       # +json_config_hash+ the original hash containing the root model
       def create_model_value(current_key, value, json_config_hash)
-        parsed_hash = { include: value }
-        parse_hash(value, parsed_hash)
-
-        json_config_hash[current_key] = parsed_hash
+        json_config_hash[current_key] = parse_hash(value, { include: value })
       end
 
       # Calls attributes finder to parse the hash and add any attributes to it
@@ -69,8 +66,8 @@ module Gitlab
       # +parsed_hash+ the original hash
       def parse_hash(value, parsed_hash)
         @attributes_finder.parse(value) do |hash|
-          parsed_hash = { include: hash_or_merge(value, hash) }
-        end
+          { include: hash_or_merge(value, hash) }
+        end || parsed_hash
       end
 
       # Adds new model configuration to an existing hash with key +current_key+