diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-04-21 17:07:42 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-04-21 18:38:10 +0300 |
| commit | c6960ded8acc5f01a3b00aea2e1c1de6e6981af9 (patch) | |
| tree | 361ac6653ad005e74d618d128911300202e10e44 /app/models/members | |
| parent | c76812c79ffe3ca35b00faeaaf7fa1c362d1d27d (diff) | |
| download | gitlab-ce-c6960ded8acc5f01a3b00aea2e1c1de6e6981af9.tar.gz | |
Refactor add_users method for project and groupdz-cleanup-add-users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/members')
| -rw-r--r-- | app/models/members/group_member.rb | 12 | ||||
| -rw-r--r-- | app/models/members/project_member.rb | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb index 483425cd30f..28e10bc6172 100644 --- a/app/models/members/group_member.rb +++ b/app/models/members/group_member.rb @@ -21,18 +21,6 @@ class GroupMember < Member Gitlab::Access.sym_options_with_owner end - def self.add_users_to_group(group, users, access_level, current_user: nil, expires_at: nil) - self.transaction do - add_users_to_source( - group, - users, - access_level, - current_user: current_user, - expires_at: expires_at - ) - end - end - def group source end diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb index 912820b51ac..b3a91feb091 100644 --- a/app/models/members/project_member.rb +++ b/app/models/members/project_member.rb @@ -16,7 +16,7 @@ class ProjectMember < Member before_destroy :delete_member_todos class << self - # Add users to project teams with passed access option + # Add users to projects with passed access option # # access can be an integer representing a access code # or symbol like :master representing role @@ -39,7 +39,7 @@ class ProjectMember < Member project_ids.each do |project_id| project = Project.find(project_id) - add_users_to_source( + add_users( project, users, access_level, |