diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-24 14:26:50 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-24 14:26:50 +0000 |
| commit | f565e126d2f7d58d5b0435f324a4ea8081b6c5cb (patch) | |
| tree | 7d533a104b5a1e7756902da5d0bb6c2365b701f0 | |
| parent | baf41fd7cfa994d30bb3d15acf57470005b3e882 (diff) | |
| parent | 6a5b3a5c8f920ea4624ed080371fb1f77f35289c (diff) | |
| download | gitlab-ce-f565e126d2f7d58d5b0435f324a4ea8081b6c5cb.tar.gz | |
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
| -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" |