-
- Downloads
Merge branch 'issue_18585' into 'master'
Allow to disable user request access to groups/projects fixes #18585   ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - 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 !5286
No related branches found
No related tags found
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/controllers/admin/groups_controller.rb 1 addition, 1 deletionapp/controllers/admin/groups_controller.rb
- app/controllers/groups_controller.rb 1 addition, 1 deletionapp/controllers/groups_controller.rb
- app/controllers/projects_controller.rb 1 addition, 1 deletionapp/controllers/projects_controller.rb
- app/models/ability.rb 2 additions, 2 deletionsapp/models/ability.rb
- app/views/admin/groups/_form.html.haml 4 additions, 0 deletionsapp/views/admin/groups/_form.html.haml
- app/views/groups/edit.html.haml 4 additions, 0 deletionsapp/views/groups/edit.html.haml
- app/views/projects/edit.html.haml 4 additions, 0 deletionsapp/views/projects/edit.html.haml
- app/views/shared/_allow_request_access.html.haml 6 additions, 0 deletionsapp/views/shared/_allow_request_access.html.haml
- db/migrate/20160715154212_add_request_access_enabled_to_projects.rb 12 additions, 0 deletions.../20160715154212_add_request_access_enabled_to_projects.rb
- db/migrate/20160715204316_add_request_access_enabled_to_groups.rb 12 additions, 0 deletions...te/20160715204316_add_request_access_enabled_to_groups.rb
- db/schema.rb 7 additions, 5 deletionsdb/schema.rb
- doc/workflow/add-user/add-user.md 3 additions, 0 deletionsdoc/workflow/add-user/add-user.md
- doc/workflow/groups.md 3 additions, 0 deletionsdoc/workflow/groups.md
- spec/features/groups/members/user_requests_access_spec.rb 7 additions, 0 deletionsspec/features/groups/members/user_requests_access_spec.rb
- spec/features/projects/members/user_requests_access_spec.rb 7 additions, 0 deletionsspec/features/projects/members/user_requests_access_spec.rb
Loading
Please register or sign in to comment