summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2013-10-14 14:27:27 +0200
committerMarin Jankovski <maxlazio@gmail.com>2013-10-14 15:15:14 +0200
commit97cf31c4cb36c4d7f259f768f04a8e995da1d278 (patch)
tree77d1fcb04b4f951fe2784c7e9129eb96b54a6923 /app
parent2c0c9e26e82a99d11ddbacd4dc161de42fa78162 (diff)
downloadgitlab-ce-97cf31c4cb36c4d7f259f768f04a8e995da1d278.tar.gz
Update user access level when adding to group.
Diffstat (limited to 'app')
-rw-r--r--app/models/group.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb
index d6272ca46f5..0ee058be15d 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -26,7 +26,8 @@ class Group < Namespace
def add_users(user_ids, group_access)
user_ids.compact.each do |user_id|
- self.users_groups.create(user_id: user_id, group_access: group_access)
+ user = self.users_groups.find_or_initialize_by_user_id(user_id)
+ user.update_attributes(group_access: group_access)
end
end