Commit 608c9e1a authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Revert 'unknown_sign_in_email' change, following upstream

This change, see upstream https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46018,
didn't make it to releases, but we had it in our release branch.

The bad part is that it relies on a method that doesn't exist on this
version (`password_authentication_enabled_for_web?`), hence it
probably was breaking all login notifications.

--HG--
branch : heptapod-0-21
parent ce5393c5c069
Pipeline #21321 failed with stages
in 21 minutes and 12 seconds
......@@ -18,6 +18,7 @@ Please read migration instructions in the
### Heptapod 0.21.1 (2021-04-28)
- heptapod#475: upstream Gitlab update to 13.10.4 (from 13.10.3)
- fixed problem with user email login notifications
- all other changes from Heptapod 0.20.7 below
### Heptapod 0.21.0 (2021-04-22)
......
......@@ -45,7 +45,6 @@
- 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.')
......
---
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