diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-23 13:10:39 +0000 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-23 13:10:39 +0000 |
| commit | efdca2e6b41f5c05a026cc583646b13555e63986 (patch) | |
| tree | 647daa7788875bea3abf63439b940e8e736f946c /lib | |
| parent | bd1ef521732715310dedb2cb2071a589432444ea (diff) | |
| parent | 30d915110f94c75b464e1cee5e51a16fbd72fabd (diff) | |
| download | gitlab-ce-efdca2e6b41f5c05a026cc583646b13555e63986.tar.gz | |
Merge branch 'fix-import-member-access' into 'master'
Fix issue importing members with owner access
Closes #61715
See merge request gitlab-org/gitlab-ce!28636
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/members_mapper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb index 6be95a16513..5ab5059165e 100644 --- a/lib/gitlab/import_export/members_mapper.rb +++ b/lib/gitlab/import_export/members_mapper.rb @@ -59,7 +59,11 @@ module Gitlab end def member_hash(member) - parsed_hash(member).merge('source_id' => @project.id, 'importing' => true) + parsed_hash(member).merge( + 'source_id' => @project.id, + 'importing' => true, + 'access_level' => [member['access_level'], ProjectMember::MAINTAINER].min + ) end def parsed_hash(member) |