diff options
| author | George Koltsov <gkoltsov@gitlab.com> | 2019-07-17 12:24:36 +0100 |
|---|---|---|
| committer | George Koltsov <gkoltsov@gitlab.com> | 2019-07-23 09:23:50 +0100 |
| commit | 3463c24d409eaa4268be034253f51faaced2952e (patch) | |
| tree | cd024fe87b5a553fb3763ec24c55cb8b729ff82c | |
| parent | 0bd54eb43626c008a36958e42019f0dfea794dde (diff) | |
| download | gitlab-ce-georgekoltsov/64377-add-better-log-msg-to-members-mapper.tar.gz | |
Add changelog entrygeorgekoltsov/64377-add-better-log-msg-to-members-mapper
| -rw-r--r-- | changelogs/unreleased/georgekoltsov-64377-add-better-log-msg-to-members-mapper.yml | 6 | ||||
| -rw-r--r-- | lib/gitlab/import_export/members_mapper.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/georgekoltsov-64377-add-better-log-msg-to-members-mapper.yml b/changelogs/unreleased/georgekoltsov-64377-add-better-log-msg-to-members-mapper.yml new file mode 100644 index 00000000000..9557e633f76 --- /dev/null +++ b/changelogs/unreleased/georgekoltsov-64377-add-better-log-msg-to-members-mapper.yml @@ -0,0 +1,6 @@ +--- +title: When GitLab import fails during importer user mapping step, add an explicit + error message mentioning importer +merge_request: 30838 +author: +type: other diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb index d0e30b246ef..ab19a509310 100644 --- a/lib/gitlab/import_export/members_mapper.rb +++ b/lib/gitlab/import_export/members_mapper.rb @@ -51,7 +51,7 @@ module Gitlab ProjectMember.create!(user: @user, access_level: ProjectMember::MAINTAINER, source_id: @project.id, importing: true) rescue => e - raise e, ['Error adding importer user to project members', e.message].join('. ') + raise e, "Error adding importer user to project members. #{e.message}" end def add_team_member(member, existing_user = nil) |