From 8e6af8c59ff1d22bc32e3d2ef44da5399bc23727 Mon Sep 17 00:00:00 2001
From: George Koltsov <gkoltsov@gitlab.com>
Date: Wed, 17 Jul 2019 11:16:37 +0100
Subject: Add better error message MembersMapper#ensure_default_member!

More details in: https://gitlab.com/gitlab-org/gitlab-ce/issues/64377
---
 lib/gitlab/import_export/members_mapper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb
index a154de5419e..d0e30b246ef 100644
--- a/lib/gitlab/import_export/members_mapper.rb
+++ b/lib/gitlab/import_export/members_mapper.rb
@@ -50,6 +50,8 @@ module Gitlab
         @project.project_members.destroy_all # rubocop: disable DestroyAll
 
         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('. ')
       end
 
       def add_team_member(member, existing_user = nil)
-- 
cgit v1.2.1