Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
56e0f2fb63d2
Commit
f04e9dad
authored
Aug 05, 2016
by
James Lopez
Browse files
Support pending invitation project members importing projects
parent
a15bbe4ad323
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
56e0f2fb
...
...
@@ -73,6 +73,7 @@ v 8.11.0 (unreleased)
- Add description to new_issue email and new_merge_request_email in text/plain content type. !5663 (dixpac)
- Speed up and reduce memory usage of Commit#repo_changes, Repository#expire_avatar_cache and IrkerWorker
- Add unfold links for Side-by-Side view. !5415 (Tim Masliuchenko)
- Adds support for pending invitation project members importing projects
v 8.10.5 (unreleased)
...
...
lib/gitlab/import_export/members_mapper.rb
View file @
56e0f2fb
...
...
@@ -18,11 +18,14 @@ def map
@map
||=
begin
@exported_members
.
inject
(
missing_keys_tracking_hash
)
do
|
hash
,
member
|
existing_user
=
User
.
where
(
find_project_user_query
(
member
)).
first
old_user_id
=
member
[
'user'
][
'id'
]
if
existing_user
&&
add_user_as_team_member
(
existing_user
,
member
)
hash
[
old_user_id
]
=
existing_user
.
id
if
member
[
'user'
]
old_user_id
=
member
[
'user'
][
'id'
]
existing_user
=
User
.
where
(
find_project_user_query
(
member
)).
first
hash
[
old_user_id
]
=
existing_user
.
id
if
existing_user
&&
add_team_member
(
member
,
existing_user
)
else
add_team_member
(
member
)
end
hash
end
end
...
...
@@ -45,7 +48,7 @@ def ensure_default_member!
ProjectMember
.
create!
(
user:
@user
,
access_level:
ProjectMember
::
MASTER
,
source_id:
@project
.
id
,
importing:
true
)
end
def
add_
user_as_
team_member
(
existing_user
,
member
)
def
add_team_member
(
member
,
existing_user
=
nil
)
member
[
'user'
]
=
existing_user
ProjectMember
.
create
(
member_hash
(
member
)).
persisted?
...
...
spec/lib/gitlab/import_export/members_mapper_spec.rb
View file @
56e0f2fb
...
...
@@ -26,6 +26,20 @@
"email"
=>
user2
.
email
,
"username"
=>
user2
.
username
}
},
{
"id"
=>
3
,
"access_level"
=>
40
,
"source_id"
=>
14
,
"source_type"
=>
"Project"
,
"user_id"
=>
nil
,
"notification_level"
=>
3
,
"created_at"
=>
"2016-03-11T10:21:44.822Z"
,
"updated_at"
=>
"2016-03-11T10:21:44.822Z"
,
"created_by_id"
=>
1
,
"invite_email"
=>
'invite@test.com'
,
"invite_token"
=>
'token'
,
"invite_accepted_at"
=>
nil
}]
end
...
...
@@ -47,5 +61,11 @@
expect
(
members_mapper
.
missing_author_ids
.
first
).
to
eq
(
-
1
)
end
it
'has invited members with no user'
do
members_mapper
.
map
expect
(
ProjectMember
.
find_by_invite_email
(
'invite@test.com'
)).
not_to
be_nil
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment