diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-24 14:26:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-29 12:24:45 +0200 |
| commit | b34edfb5151530f180833fb12ed219e6488bf600 (patch) | |
| tree | b891186861e9043dbe4cf0d7032143e82747983b | |
| parent | 48c8fd91130b876d72bda595b040aeaa31245e95 (diff) | |
| download | gitlab-ce-b34edfb5151530f180833fb12ed219e6488bf600.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-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 17 |
2 files changed, 10 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG index 68c5d16d787..77900be8bb7 100644 --- a/CHANGELOG +++ b/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 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" |