Skip to content
代码片段 群组 项目
提交 ee380a23 编辑于 作者: Ethan Urie's avatar Ethan Urie 提交者: Dylan Griffith
浏览文件

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
上级 60098d35
No related branches found
No related tags found
无相关合并请求
显示
348 个添加35 个删除
加载中
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册