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

CHANGELOG

@@ -11,6 +11,7 @@ v 8.6.2
   - Fix the milestone 'upcoming' filter. !3364
   - 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
+  - Fix an issue hiding the password form when signed-in with a linked account. !3381
 
 v 8.6.1
   - Add option to reload the schema before restoring a database backup. !2807

app/views/profiles/passwords/edit.html.haml

@@ -24,12 +24,13 @@
           = f.password_field :current_password, required: true, class: 'form-control'
           %p.help-block
             You must provide your current password in order to change it.
-        .form-group
-          = f.label :password, 'New password', class: 'label-light'
-          = f.password_field :password, required: true, class: 'form-control'
-        .form-group
-          = f.label :password_confirmation, class: 'label-light'
-          = f.password_field :password_confirmation, required: true, class: 'form-control'
-        .prepend-top-default.append-bottom-default
-          = f.submit 'Save password', class: "btn btn-create append-right-10"
+      .form-group
+        = f.label :password, 'New password', class: 'label-light'
+        = f.password_field :password, required: true, class: 'form-control'
+      .form-group
+        = f.label :password_confirmation, class: 'label-light'
+        = f.password_field :password_confirmation, required: true, class: 'form-control'
+      .prepend-top-default.append-bottom-default
+        = 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"