diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-24 11:22:44 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-24 11:22:44 +0000 |
| commit | 6a5b3a5c8f920ea4624ed080371fb1f77f35289c (patch) | |
| tree | 52af81c7d3d75fdb534ea7b9442afa35b621e859 | |
| parent | ffe5ac41b84c342a8b1d099afe116cb1522da8f2 (diff) | |
| download | gitlab-ce-6a5b3a5c8f920ea4624ed080371fb1f77f35289c.tar.gz | |
Shows password form when signed in with linked accountfix-password-settings-regressions
Closes #14379
| -rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index afd4f996b62..44d758dceb3 100644 --- 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" |