-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'
Resolve "Destroying a project causes post_decline_request to be executed" ## What does this MR do? Ensure we don't send "access request declined" to access requesters when a project is deleted. ## Are there points in the code the reviewer needs to double check? I've created a service to decouple the notification sending from the AR model. ## Why was this MR needed? Because there was an issue. ## What are the relevant issue numbers? Fixes #18755, #18750. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG needed. - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4744
Showing
- app/controllers/application_controller.rb 4 additions, 0 deletionsapp/controllers/application_controller.rb
- app/controllers/concerns/membership_actions.rb 8 additions, 23 deletionsapp/controllers/concerns/membership_actions.rb
- app/controllers/groups/group_members_controller.rb 1 addition, 7 deletionsapp/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb 1 addition, 7 deletionsapp/controllers/projects/project_members_controller.rb
- app/models/member.rb 1 addition, 6 deletionsapp/models/member.rb
- app/models/members/group_member.rb 0 additions, 12 deletionsapp/models/members/group_member.rb
- app/models/members/project_member.rb 0 additions, 12 deletionsapp/models/members/project_member.rb
- app/services/members/destroy_service.rb 21 additions, 0 deletionsapp/services/members/destroy_service.rb
- app/services/notification_service.rb 7 additions, 14 deletionsapp/services/notification_service.rb
- app/views/layouts/nav/_group_settings.html.haml 21 additions, 15 deletionsapp/views/layouts/nav/_group_settings.html.haml
- app/views/layouts/nav/_project.html.haml 6 additions, 5 deletionsapp/views/layouts/nav/_project.html.haml
- app/views/layouts/nav/_project_settings.html.haml 1 addition, 1 deletionapp/views/layouts/nav/_project_settings.html.haml
- features/dashboard/group.feature 0 additions, 44 deletionsfeatures/dashboard/group.feature
- features/steps/dashboard/group.rb 0 additions, 42 deletionsfeatures/steps/dashboard/group.rb
- lib/gitlab/access.rb 2 additions, 0 deletionslib/gitlab/access.rb
- spec/controllers/groups/group_members_controller_spec.rb 2 additions, 4 deletionsspec/controllers/groups/group_members_controller_spec.rb
- spec/controllers/projects/project_members_controller_spec.rb 2 additions, 6 deletionsspec/controllers/projects/project_members_controller_spec.rb
- spec/features/groups/members/last_owner_cannot_leave_group_spec.rb 16 additions, 0 deletions...ures/groups/members/last_owner_cannot_leave_group_spec.rb
- spec/features/groups/members/member_leaves_group_spec.rb 21 additions, 0 deletionsspec/features/groups/members/member_leaves_group_spec.rb
- spec/features/groups/members/user_requests_access_spec.rb 1 addition, 0 deletionsspec/features/groups/members/user_requests_access_spec.rb
Loading
Please register or sign in to comment