Commit 07b19ec0 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

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

Show password hint only if password_authentication_enabled_for_web? on new location sign in email

See merge request gitlab-org/gitlab!46018
parents 2caa664a 8a71e51c
......@@ -45,8 +45,9 @@
- 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 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 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.')
- 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