Adding ability to view Trusted user in User admin panel
Also adding the ability to trust/untrust a user from the admin panel. Renamed vue component to comply with eslint rules (cherry picked from commit 66b5d4e5) Pulling in the trust/untrust services Add trust specs for UserActionsHelper (cherry picked from commit a57b001b) Add request specs (cherry picked from commit 87ff28cf) Fix trust/untrust spec in model (cherry picked from commit edca4ae2) Fix trust/untrust spec in model (cherry picked from commit edca4ae2) (cherry picked from commit 5a680330755696bc2244d0b41897ab984867d1f2) Updated locale file and json files Refactor to simplify the setting of the custom attribute Use `let_it_be_with_reload` for the `user` to fix issues with setting the custom attribute. Utilize the `trusted_with_spam_attribute` association Remove unnecessary files The action components for the users admin panel weren't meant to be part of this MR. Moving them out to the appropriate MR. Remove unneeded changes for controller and helpers Filter reason options if user selects `Trust user` Renamed vue component to comply with eslint rules (cherry picked from commit 66b5d4e5) (cherry picked from commit a57b001b) (cherry picked from commit 87ff28cf) (cherry picked from commit edca4ae2) (cherry picked from commit edca4ae2) (cherry picked from commit 5a680330755696bc2244d0b41897ab984867d1f2) Changelog: added
显示
- app/assets/javascripts/admin/users/components/actions/index.js 4 个添加, 0 个删除...ssets/javascripts/admin/users/components/actions/index.js
- app/assets/javascripts/admin/users/components/actions/trust_user.vue 62 个添加, 0 个删除...javascripts/admin/users/components/actions/trust_user.vue
- app/assets/javascripts/admin/users/components/actions/untrust_user.vue 56 个添加, 0 个删除...vascripts/admin/users/components/actions/untrust_user.vue
- app/assets/javascripts/admin/users/constants.js 2 个添加, 0 个删除app/assets/javascripts/admin/users/constants.js
- app/controllers/admin/users_controller.rb 1 个添加, 1 个删除app/controllers/admin/users_controller.rb
- app/helpers/admin/user_actions_helper.rb 15 个添加, 0 个删除app/helpers/admin/user_actions_helper.rb
- app/helpers/users_helper.rb 3 个添加, 1 个删除app/helpers/users_helper.rb
- app/models/user.rb 8 个添加, 0 个删除app/models/user.rb
- app/views/admin/users/_users.html.haml 3 个添加, 0 个删除app/views/admin/users/_users.html.haml
- doc/administration/moderate_users.md 39 个添加, 0 个删除doc/administration/moderate_users.md
- doc/administration/review_spam_logs.md 0 个添加, 12 个删除doc/administration/review_spam_logs.md
- locale/gitlab.pot 27 个添加, 0 个删除locale/gitlab.pot
- spec/features/admin/admin_users_spec.rb 8 个添加, 0 个删除spec/features/admin/admin_users_spec.rb
- spec/fixtures/api/schemas/entities/admin_users_data_attributes_paths.json 48 个添加, 14 个删除...i/schemas/entities/admin_users_data_attributes_paths.json
- spec/frontend/admin/users/constants.js 4 个添加, 0 个删除spec/frontend/admin/users/constants.js
- spec/helpers/admin/user_actions_helper_spec.rb 52 个添加, 7 个删除spec/helpers/admin/user_actions_helper_spec.rb
- spec/models/user_spec.rb 16 个添加, 0 个删除spec/models/user_spec.rb
加载中
想要评论请 注册 或 登录