Commit b34edfb5 authored by Jacob Schatz's avatar Jacob Schatz Committed by Rémy Coutable

Merge branch 'fix-password-settings-regressions' into 'master'

Shows password form when signed in with linked account

Closes #14379

Doing this to get the builds passing for !3325

See merge request !3381
parent 48c8fd91
...@@ -11,6 +11,7 @@ v 8.6.2 ...@@ -11,6 +11,7 @@ v 8.6.2
- Fix the milestone 'upcoming' filter. !3364 - Fix the milestone 'upcoming' filter. !3364
- Fix comments on confidential issues showing up in activity feed to non-members. !3375 - Fix comments on confidential issues showing up in activity feed to non-members. !3375
- Add a tooltip to new branch button in issue page. !3380 - Add a tooltip to new branch button in issue page. !3380
- Fix an issue hiding the password form when signed-in with a linked account. !3381
v 8.6.1 v 8.6.1
- Add option to reload the schema before restoring a database backup. !2807 - Add option to reload the schema before restoring a database backup. !2807
......
...@@ -32,4 +32,5 @@ ...@@ -32,4 +32,5 @@
= f.password_field :password_confirmation, required: true, class: 'form-control' = f.password_field :password_confirmation, required: true, class: 'form-control'
.prepend-top-default.append-bottom-default .prepend-top-default.append-bottom-default
= f.submit 'Save password', class: "btn btn-create append-right-10" = f.submit 'Save password', class: "btn btn-create append-right-10"
- 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, class: "account-btn-link"
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