diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 12:09:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 12:09:20 +0000 |
| commit | 6559f0ee67c564d62e12936e91cef6abf37ce102 (patch) | |
| tree | ac843e2187f4fa22eade9be5ae380a7fc793e31b /app/views/profiles/passwords | |
| parent | 93e4425400aa60f54f1bbccb26ef6581503952f3 (diff) | |
| download | gitlab-ce-6559f0ee67c564d62e12936e91cef6abf37ce102.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/profiles/passwords')
| -rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/passwords/new.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index fe16c2e2f28..1ee5f52e407 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -30,6 +30,6 @@ = f.label :password_confirmation, _('Password confirmation'), class: 'label-bold' = f.password_field :password_confirmation, required: true, class: 'form-control', data: { qa_selector: 'confirm_password_field' } .gl-mt-3.gl-mb-3 - = f.submit _('Save password'), class: "btn btn-success gl-mr-3", data: { qa_selector: 'save_password_button' } + = f.submit _('Save password'), class: "gl-button btn btn-success gl-mr-3", data: { qa_selector: 'save_password_button' } - unless @user.password_automatically_set? = link_to _('I forgot my password'), reset_profile_password_path, method: :put diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml index ce60455ab89..f6783528243 100644 --- a/app/views/profiles/passwords/new.html.haml +++ b/app/views/profiles/passwords/new.html.haml @@ -28,4 +28,4 @@ .col-sm-10 = f.password_field :password_confirmation, required: true, class: 'form-control' .form-actions - = f.submit _('Set new password'), class: 'btn btn-success' + = f.submit _('Set new password'), class: 'gl-button btn btn-success' |