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

Merge branch 'fix-password-settings-regressions' into 'master'
f565e126 · Jacob Schatz · baf41fd7 · 6a5b3a5c · f565e126
Commit f565e126 authored Mar 24, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 8 deletions

edit.html.haml app/views/profiles/passwords/edit.html.haml +9 -8

No files found.
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/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"