Merge branch 'kenneth-show-email-reset-admins' into 'master'
Show `email_reset_offered_at` to admin users See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137610 Merged-by:Illya Klymov <xanf@xanf.me> Approved-by:
Illya Klymov <xanf@xanf.me> Approved-by:
Minahil Nichols <minahilnichols@gitlab.com> Approved-by:
Javiera Tapia <jtapia@gitlab.com> Approved-by:
Aleksei Lipniagov <alipniagov@gitlab.com> Reviewed-by:
Illya Klymov <xanf@xanf.me> Reviewed-by:
Aleksei Lipniagov <alipniagov@gitlab.com> Co-authored-by:
Kenneth Chu <ksiuhengchu@gitlab.com>
显示
- app/views/admin/users/show.html.haml 5 个添加, 0 个删除app/views/admin/users/show.html.haml
- doc/api/users.md 10 个添加, 3 个删除doc/api/users.md
- lib/api/entities/user_with_admin.rb 1 个添加, 0 个删除lib/api/entities/user_with_admin.rb
- locale/gitlab.pot 3 个添加, 0 个删除locale/gitlab.pot
- spec/requests/api/users_spec.rb 3 个添加, 0 个删除spec/requests/api/users_spec.rb
加载中
想要评论请 注册 或 登录