summaryrefslogtreecommitdiff
path: root/app/models/project_team.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-10 15:26:53 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 12:08:11 +0200
commit1c0824f451a3fe8f328f0360c94cd251ff664ed6 (patch)
tree37489588458d64ae4fc19fa8a452ec060f6debfd /app/models/project_team.rb
parent2a45eb6a912a35b71e3cbe7aacbda3323730d9da (diff)
downloadgitlab-ce-1c0824f451a3fe8f328f0360c94cd251ff664ed6.tar.gz
Correctly import invited members.
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r--app/models/project_team.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 313e459d701..56e49af2324 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -93,7 +93,7 @@ class ProjectTeam
source_members.reject! do |member|
# Skip if user already present in team
- target_user_ids.include?(member.user_id)
+ !member.invite? && target_user_ids.include?(member.user_id)
end
source_members.map! do |member|