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

fixed small issue mapping members

Browse source
This commit is contained in:
James Lopez 2016-05-19 17:02:49 +02:00
parent 38b92fe87b
commit dd86c91c73
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/gitlab/import_export/members_mapper.rb
View file

@ -25,7 +25,6 @@ module Gitlab
def default_project_member def default_project_member
@default_project_member ||= @default_project_member ||=
begin begin
return @project.project_members.first.user.id unless @project.project_members.empty?
default_member = ProjectMember.new(default_project_member_hash) default_member = ProjectMember.new(default_project_member_hash)
default_member.save! default_member.save!
default_member.user.id default_member.user.id

6
lib/gitlab/import_export/relation_factory.rb
View file

@ -39,11 +39,11 @@ module Gitlab
def update_missing_author(relation_hash, members_map, user_admin) def update_missing_author(relation_hash, members_map, user_admin)
old_author_id = relation_hash['author_id'] old_author_id = relation_hash['author_id']
# Users with admin access have access to mapping of users # Users with admin access can map users
if user_admin if user_admin
relation_hash['author_id'] = members_map.default_project_member
else
relation_hash['author_id'] = members_map.map[old_author_id] relation_hash['author_id'] = members_map.map[old_author_id]
else
relation_hash['author_id'] = members_map.default_project_member
end end
author = relation_hash.delete('author') author = relation_hash.delete('author')