diff options
author | James Lopez <james@jameslopez.es> | 2017-01-18 14:13:01 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-01-18 14:13:01 +0100 |
commit | 35442766cf1041d2bb100ff73f58f92347649027 (patch) | |
tree | 1d822c1d8a9e1629b77dd01eafb6b52e62845c54 /lib | |
parent | e2f0b83061df3b19b683b67d142acea65d5df0fd (diff) | |
download | gitlab-ce-35442766cf1041d2bb100ff73f58f92347649027.tar.gz |
do not map usersat all unless admin
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/import_export/members_mapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb index b790733f4a7..1dab7c37d25 100644 --- a/lib/gitlab/import_export/members_mapper.rb +++ b/lib/gitlab/import_export/members_mapper.rb @@ -4,7 +4,7 @@ module Gitlab 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 = [] @@ -64,7 +64,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 |