-
- 下载
Merge branch 'el-associated-account-pending-deletion' into 'master'
Add error to indicate email is linked to an account pending deletion See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/148369 Merged-by:Eduardo Sanz García <esanz-garcia@gitlab.com> Approved-by:
Arpit Gogia <12347103-arpitgogia@users.noreply.gitlab.com> Approved-by:
Alex Pennells <apennells@gitlab.com> Approved-by:
Sincheol (David) Kim <dkim@gitlab.com> Approved-by:
Eduardo Sanz García <esanz-garcia@gitlab.com> Reviewed-by:
Sincheol (David) Kim <dkim@gitlab.com> Reviewed-by:
Eduardo Sanz García <esanz-garcia@gitlab.com> Reviewed-by:
Arpit Gogia <12347103-arpitgogia@users.noreply.gitlab.com> Reviewed-by:
Alex Pennells <apennells@gitlab.com> Co-authored-by:
Eugie Limpin <elimpin@gitlab.com>
显示
- app/helpers/form_helper.rb 2 个添加, 2 个删除app/helpers/form_helper.rb
- app/models/user.rb 15 个添加, 2 个删除app/models/user.rb
- app/views/devise/shared/_error_messages.html.haml 2 个添加, 9 个删除app/views/devise/shared/_error_messages.html.haml
- locale/gitlab.pot 3 个添加, 0 个删除locale/gitlab.pot
- spec/helpers/form_helper_spec.rb 9 个添加, 1 个删除spec/helpers/form_helper_spec.rb
- spec/models/user_spec.rb 35 个添加, 0 个删除spec/models/user_spec.rb
加载中
想要评论请 注册 或 登录