Commit 69b760c0 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'revert-07b19ec0' into 'master'

Revert "Merge branch 'chore/unknown-sign-in-info-text' into 'master'"

See merge request gitlab-org/gitlab!56468
parents e5e6b0d2 31d0ee36
......@@ -45,9 +45,8 @@
- password_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: 'https://docs.gitlab.com/ee/user/profile/#changing-your-password' }
= _('If you recently signed in and recognize the IP address, you may disregard this email.')
%p
- if password_authentication_enabled_for_web?
= _('If you did not recently sign in, you should immediately %{password_link_start}change your password%{password_link_end}.').html_safe % { password_link_start: password_link_start, password_link_end: '</a>'.html_safe }
= _('Passwords should be unique and not used for any other sites or services.')
= _('If you did not recently sign in, you should immediately %{password_link_start}change your password%{password_link_end}.').html_safe % { password_link_start: password_link_start, password_link_end: '</a>'.html_safe }
= _('Passwords should be unique and not used for any other sites or services.')
- unless @user.two_factor_enabled?
%p
......
---
title: Show password hint only if password_authentication_enabled_for_web? on new location logins
merge_request: 46018
author: Roger Meier
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment