-
- Downloads
Merge branch...
Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access' into 'master' Resolve "`Member.add_user`doesn't detect existing members that have requested access" ## What does this MR do? This merge request handle the case when an access requester is added to a group or project (via the members page or the API). In `Member.add_user`, if an access requester already exists, we simply accept their request (and set the `created_by`, `access_level` and `expires_at` attributes if given). ## Are there points in the code the reviewer needs to double check? I've taken the opportunity to cleanup the whole `{Group,Project}Member.add_user*` methods since it was quite a mess. ## What are the relevant issue numbers? Closes #21983 See merge request !6393
No related branches found
No related tags found
Showing
- app/models/group.rb 20 additions, 16 deletionsapp/models/group.rb
- app/models/member.rb 50 additions, 29 deletionsapp/models/member.rb
- app/models/members/group_member.rb 16 additions, 0 deletionsapp/models/members/group_member.rb
- app/models/members/project_member.rb 15 additions, 29 deletionsapp/models/members/project_member.rb
- app/models/project.rb 1 addition, 4 deletionsapp/models/project.rb
- app/models/project_team.rb 10 additions, 4 deletionsapp/models/project_team.rb
- db/fixtures/development/06_teams.rb 1 addition, 1 deletiondb/fixtures/development/06_teams.rb
- lib/api/members.rb 2 additions, 15 deletionslib/api/members.rb
- lib/gitlab/access.rb 4 additions, 0 deletionslib/gitlab/access.rb
- spec/controllers/projects/templates_controller_spec.rb 1 addition, 1 deletionspec/controllers/projects/templates_controller_spec.rb
- spec/factories/project_members.rb 4 additions, 19 deletionsspec/factories/project_members.rb
- spec/features/projects/members/owner_cannot_leave_project_spec.rb 1 addition, 3 deletions...tures/projects/members/owner_cannot_leave_project_spec.rb
- spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb 1 addition, 3 deletions...embers/owner_cannot_request_access_to_his_project_spec.rb
- spec/features/projects_spec.rb 3 additions, 3 deletionsspec/features/projects_spec.rb
- spec/finders/joined_groups_finder_spec.rb 1 addition, 1 deletionspec/finders/joined_groups_finder_spec.rb
- spec/finders/projects_finder_spec.rb 1 addition, 1 deletionspec/finders/projects_finder_spec.rb
- spec/lib/gitlab/template/issue_template_spec.rb 3 additions, 3 deletionsspec/lib/gitlab/template/issue_template_spec.rb
- spec/lib/gitlab/template/merge_request_template_spec.rb 3 additions, 3 deletionsspec/lib/gitlab/template/merge_request_template_spec.rb
- spec/mailers/notify_spec.rb 26 additions, 24 deletionsspec/mailers/notify_spec.rb
- spec/models/issue_spec.rb 1 addition, 1 deletionspec/models/issue_spec.rb
Loading
Please register or sign in to comment