-
- 下载
Merge branch '13948-access-request-to-projects-and-groups' into 'master'
Allow users to request access to projects and groups #### TODO: - [x] Factorize the projects & groups members list - [x] Factorize `request_access` and `approve` controller methods into a concern - [x] Factorize the project & group dropdowns - [x] Factorize access request routes - [x] Factorize mailers #### Will be done in separate MRs - [ ] Documentation - [ ] API #### Access request to project - [x] Design project access request button to spec (defined in #13948) - [x] Request access to a project as a logged in user - [x] Withdraw access request to a project as a logged in user - [x] Do not treat project member request as actual membership (done partly in Ability) - [x] Display access requests on project's members page (+ allow to change level, approve, and deny request) - [x] Email requesting user at notification email address when accepted/denied - [x] Email all project admins at notification email addresses when new access request - [x] Unit specs to cover new functionality: `AccessRequestable` is missing specs - [x] Controller specs to cover new functionality - [x] Mailer specs to cover new functionality - [x] Features specs to cover new UI and interactions - [x] Regression specs still passing #### Access request to group - [x] Design group access request button to spec (defined in #13948) - [x] Request access to a group as a logged in user - [x] Withdraw access request to a group as a logged in user - [x] Do not treat group member request as actual membership - [x] Display access requests on group's members page (+ allow to change level, approve, and deny request) - [x] Email requesting user at notification email address when accepted/denied - [x] Email all project admins at notification email addresses when new access request - [x] Unit specs to cover new functionality - [x] Controller specs to cover new functionality - [x] Mailer specs to cover new functionality - [x] Features specs to cover new UI and interactions - [x] Regression specs still passing Closes #13948. ### Requesting access to a project #### Responsive UI  #### Request access link  #### Flash once access is requested  #### Email sent to project admins on new access requests ##### HTML Email  ##### Plain Email  ### Withdrawing access request to a project #### Withdraw access request link  #### Withdraw access request confirmation dialog box  #### Flash once access has been withdrawn  ### Access requests management page  #### Deny access request confirmation dialog box  #### Email sent to requester on denied access requests ##### HTML Email  ##### Plain Email  #### Email sent to requester on granted access requests ##### HTML Email  ##### Plain Email  ---------------------------------- ---------------------------------- ### Requesting access to a group #### Responsive UI  #### Request access link  #### Flash once access is requested  #### Email sent to project admins on new access requests ##### HTML Email  ##### Plain Email  ### Withdrawing access request to a project #### Withdraw access request link  #### Withdraw access request confirmation dialog box  #### Flash once access has been withdrawn  ### Access requests management page  #### Deny access request confirmation dialog box  #### Email sent to requester on denied access requests ##### HTML Email  ##### Plain Email  #### Email sent to requester on granted access requests ##### HTML Email  ##### Plain Email  See merge request !3798
显示
- app/assets/stylesheets/pages/groups.scss 17 个添加, 0 个删除app/assets/stylesheets/pages/groups.scss
- app/assets/stylesheets/pages/projects.scss 12 个添加, 9 个删除app/assets/stylesheets/pages/projects.scss
- app/controllers/concerns/membership_actions.rb 58 个添加, 0 个删除app/controllers/concerns/membership_actions.rb
- app/controllers/groups/group_members_controller.rb 11 个添加, 18 个删除app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb 13 个添加, 23 个删除app/controllers/projects/project_members_controller.rb
- app/helpers/gitlab_routing_helper.rb 65 个添加, 12 个删除app/helpers/gitlab_routing_helper.rb
- app/helpers/groups_helper.rb 0 个添加, 20 个删除app/helpers/groups_helper.rb
- app/helpers/members_helper.rb 45 个添加, 0 个删除app/helpers/members_helper.rb
- app/helpers/projects_helper.rb 0 个添加, 20 个删除app/helpers/projects_helper.rb
- app/mailers/emails/groups.rb 0 个添加, 52 个删除app/mailers/emails/groups.rb
- app/mailers/emails/members.rb 81 个添加, 0 个删除app/mailers/emails/members.rb
- app/mailers/emails/projects.rb 0 个添加, 50 个删除app/mailers/emails/projects.rb
- app/mailers/notify.rb 3 个添加, 1 个删除app/mailers/notify.rb
- app/models/ability.rb 2 个添加, 0 个删除app/models/ability.rb
- app/models/concerns/access_requestable.rb 16 个添加, 0 个删除app/models/concerns/access_requestable.rb
- app/models/group.rb 6 个添加, 1 个删除app/models/group.rb
- app/models/member.rb 47 个添加, 6 个删除app/models/member.rb
- app/models/members/group_member.rb 17 个添加, 3 个删除app/models/members/group_member.rb
- app/models/members/project_member.rb 13 个添加, 3 个删除app/models/members/project_member.rb
- app/models/project.rb 5 个添加, 12 个删除app/models/project.rb
加载中
想要评论请 注册 或 登录