From 93c6764dacd4c605027ef1cd367d3aebe420b223 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 9 Dec 2019 12:07:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/profiles/passwords/edit.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/profiles/passwords/edit.html.haml') diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index 0e2b0430fec..af6fa6b1b61 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -32,4 +32,4 @@ .prepend-top-default.append-bottom-default = f.submit _('Save password'), class: "btn btn-success append-right-10", data: { qa_selector: 'save_password_button' } - unless @user.password_automatically_set? - = link_to _('I forgot my password'), reset_profile_password_path, method: :put, class: "account-btn-link" + = link_to _('I forgot my password'), reset_profile_password_path, method: :put -- cgit v1.2.1