summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export/relation_factory.rb
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-13 14:17:10 +0200
committerJames Lopez <james@jameslopez.es>2016-05-13 14:17:10 +0200
commita86825826915f78a0728becd91f6a31df90543ea (patch)
tree75c72f4ee7863ee2bd313890b0a980d5a5156029 /lib/gitlab/import_export/relation_factory.rb
parent25a1c6541aa3dfb41ef006d42ba280d5a1d4103d (diff)
downloadgitlab-ce-a86825826915f78a0728becd91f6a31df90543ea.tar.gz
update json and fix notes issue
Diffstat (limited to 'lib/gitlab/import_export/relation_factory.rb')
-rw-r--r--lib/gitlab/import_export/relation_factory.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 65e2a935fa9..0adcd0d5e6c 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -28,12 +28,12 @@ module Gitlab
end
def update_missing_author(relation_hash, members_map)
- old_author_id = relation_hash['author_id'].dup
+ old_author_id = relation_hash['author_id']
relation_hash['author_id'] = members_map.map[old_author_id]
return unless members_map.note_member_list.include?(old_author_id)
relation_hash['note'] = ('*Blank note*') if relation_hash['note'].blank?
- relation_hash['note'].join(missing_author_note(relation_hash['updated_at'],
+ relation_hash['note'] += (missing_author_note(relation_hash['updated_at'],
relation_hash['author']['name']))
relation_hash.delete('author')
end