diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 06:06:19 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 06:06:19 +0000 |
commit | 89861e72b7375353654513aa2bc0a3b60a5e4377 (patch) | |
tree | 60e5424a064977a346eaf5f06720dc74af54d720 /app/views/profiles | |
parent | 98dbb0a488d7b0093f352938210d9578b0f7a8a6 (diff) | |
download | gitlab-ce-89861e72b7375353654513aa2bc0a3b60a5e4377.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/profiles')
-rw-r--r-- | app/views/profiles/emails/index.html.haml | 8 | ||||
-rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index 3c20518c038..6ea4eeb66c5 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -13,9 +13,9 @@ = form_for 'email', url: profile_emails_path do |f| .form-group = f.label :email, _('Email'), class: 'label-bold' - = f.text_field :email, class: 'form-control' + = f.text_field :email, class: 'form-control', data: { qa_selector: 'email_address_field' } .prepend-top-default - = f.submit _('Add email address'), class: 'btn btn-success' + = f.submit _('Add email address'), class: 'btn btn-success', data: { qa_selector: 'add_email_address_button' } %hr %h4.prepend-top-0 = _('Linked emails (%{email_count})') % { email_count: @emails.count + 1 } @@ -45,7 +45,7 @@ - if @primary_email === current_user.notification_email %span.badge.badge-info= s_('Profiles|Default notification email') - @emails.each do |email| - %li + %li{ data: { qa_selector: 'email_row_content' } } = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? } %span.float-right - if email.email === current_user.commit_email @@ -58,6 +58,6 @@ - confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}" = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'btn btn-sm btn-warning prepend-left-10' - = link_to profile_email_path(email), data: { confirm: _('Are you sure?')}, method: :delete, class: 'btn btn-sm btn-danger prepend-left-10' do + = link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'btn btn-sm btn-danger prepend-left-10' do %span.sr-only= _('Remove') = icon('trash') diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index ac8c31189d0..0e2b0430fec 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -20,16 +20,16 @@ - unless @user.password_automatically_set? .form-group = f.label :current_password, _('Current password'), class: 'label-bold' - = f.password_field :current_password, required: true, class: 'form-control' + = f.password_field :current_password, required: true, class: 'form-control', data: { qa_selector: 'current_password_field' } %p.form-text.text-muted = _('You must provide your current password in order to change it.') .form-group = f.label :password, _('New password'), class: 'label-bold' - = f.password_field :password, required: true, class: 'form-control' + = f.password_field :password, required: true, class: 'form-control', data: { qa_selector: 'new_password_field' } .form-group = f.label :password_confirmation, _('Password confirmation'), class: 'label-bold' - = f.password_field :password_confirmation, required: true, class: 'form-control' + = f.password_field :password_confirmation, required: true, class: 'form-control', data: { qa_selector: 'confirm_password_field' } .prepend-top-default.append-bottom-default - = f.submit _('Save password'), class: "btn btn-success append-right-10" + = f.submit _('Save password'), class: "btn btn-success append-right-10", data: { qa_selector: 'save_password_button' } - unless @user.password_automatically_set? = link_to _('I forgot my password'), reset_profile_password_path, method: :put, class: "account-btn-link" |