diff options
author | Rémy Coutable <remy@rymai.me> | 2017-01-20 16:03:44 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-01-20 16:03:44 +0000 |
commit | 4af1f18639935b3a4347902f42a44e851332d5e3 (patch) | |
tree | f82f9ae8ae10bf7a953e0d3ab3b9cfdd211fca50 /lib/gitlab | |
parent | 9cac0317696cf47beb77bab28a914411b09ff26c (diff) | |
parent | e8396d8e734756be0a1460e83ed010025082e933 (diff) | |
download | gitlab-ce-4af1f18639935b3a4347902f42a44e851332d5e3.tar.gz |
Merge branch 'fix/import-users' into 'master'
Fix import no longer mapping users as admin
Closes #25346
See merge request !8625
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/import_export/members_mapper.rb | 8 | ||||
-rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 12 |
2 files changed, 6 insertions, 14 deletions
diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb index b790733f4a7..2405b94db50 100644 --- a/lib/gitlab/import_export/members_mapper.rb +++ b/lib/gitlab/import_export/members_mapper.rb @@ -1,13 +1,10 @@ module Gitlab module ImportExport class MembersMapper - attr_reader :missing_author_ids - def initialize(exported_members:, user:, project:) - @exported_members = exported_members + @exported_members = user.admin? ? exported_members : [] @user = user @project = project - @missing_author_ids = [] # This needs to run first, as second call would be from #map # which means project members already exist. @@ -39,7 +36,6 @@ module Gitlab def missing_keys_tracking_hash Hash.new do |_, key| - @missing_author_ids << key default_user_id end end @@ -64,7 +60,7 @@ module Gitlab end def find_project_user_query(member) - user_arel[:username].eq(member['user']['username']).or(user_arel[:email].eq(member['user']['email'])) + user_arel[:email].eq(member['user']['email']).or(user_arel[:username].eq(member['user']['username'])) end def user_arel diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 7a649f28340..19e43cce768 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -14,7 +14,7 @@ module Gitlab priorities: :label_priorities, label: :project_label }.freeze - USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id merge_user_id].freeze + USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id merge_user_id resolved_by_id].freeze PROJECT_REFERENCES = %w[project_id source_project_id gl_project_id target_project_id].freeze @@ -80,17 +80,13 @@ module Gitlab # is left. def set_note_author old_author_id = @relation_hash['author_id'] - - # Users with admin access can map users - @relation_hash['author_id'] = admin_user? ? @members_mapper.map[old_author_id] : @members_mapper.default_user_id - author = @relation_hash.delete('author') - update_note_for_missing_author(author['name']) if missing_author?(old_author_id) + update_note_for_missing_author(author['name']) unless has_author?(old_author_id) end - def missing_author?(old_author_id) - !admin_user? || @members_mapper.missing_author_ids.include?(old_author_id) + def has_author?(old_author_id) + admin_user? && @members_mapper.map.keys.include?(old_author_id) end def missing_author_note(updated_at, author_name) |