summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-31 22:01:53 +0000
committerJames Lopez <james@jameslopez.es>2017-02-02 09:40:37 +0100
commit1b53ed13bc05c676dadd750e990b023e91244372 (patch)
tree2b4befe81e19dfd5fa4ee60ab45415e8351feec9 /lib
parente3be216a565b05b0efec54ef23595269a61d11eb (diff)
downloadgitlab-ce-1b53ed13bc05c676dadd750e990b023e91244372.tar.gz
Merge branch 'fix/import-user-validation-error' into 'master'
Fix user validation error in Import/Export Closes #23833 See merge request !8909
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/import_export/members_mapper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb
index 2405b94db50..a09577ae48d 100644
--- a/lib/gitlab/import_export/members_mapper.rb
+++ b/lib/gitlab/import_export/members_mapper.rb
@@ -41,6 +41,8 @@ module Gitlab
end
def ensure_default_member!
+ @project.project_members.destroy_all
+
ProjectMember.create!(user: @user, access_level: ProjectMember::MASTER, source_id: @project.id, importing: true)
end