diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/views/profiles | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/views/profiles')
-rw-r--r-- | app/views/profiles/_event_table.html.haml | 11 | ||||
-rw-r--r-- | app/views/profiles/audit_log.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/emails/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/two_factor_auths/show.html.haml | 4 |
5 files changed, 12 insertions, 9 deletions
diff --git a/app/views/profiles/_event_table.html.haml b/app/views/profiles/_event_table.html.haml index f74902a3c3b..67c649a9fce 100644 --- a/app/views/profiles/_event_table.html.haml +++ b/app/views/profiles/_event_table.html.haml @@ -3,10 +3,11 @@ %ul.content-list - events.each do |event| - %li - %span.description - = audit_icon(event.details[:with], css_class: 'gl-mr-2') - = _('Signed in with %{authentication} authentication') % { authentication: event.details[:with]} - %span.float-right= time_ago_with_tooltip(event.created_at) + - if event.success? + %li + %span.description + = audit_icon('key', css_class: 'gl-mr-2') + = _('Signed in with %{authentication} authentication') % { authentication: event.provider } + %span.float-right= time_ago_with_tooltip(event.created_at) = paginate events, theme: "gitlab" diff --git a/app/views/profiles/audit_log.html.haml b/app/views/profiles/audit_log.html.haml index aec855c790e..4bbb4a21b39 100644 --- a/app/views/profiles/audit_log.html.haml +++ b/app/views/profiles/audit_log.html.haml @@ -6,6 +6,6 @@ %h4.gl-mt-0 = page_title %p - = _('This is a security log of important events involving your account.') + = _('This is a security log of authentication events involving your account.') .col-lg-8 = render 'event_table', events: @events diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index 35bdfbb1c29..0cfe65994da 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -44,7 +44,7 @@ %span.badge.badge-muted.badge-pill.gl-badge.badge-info= s_('Profiles|Public email') - if @primary_email === current_user.notification_email_or_default %span.badge.badge-muted.badge-pill.gl-badge.badge-info= s_('Profiles|Default notification email') - - @emails.each do |email| + - @emails.reject(&:user_primary_email?).each do |email| %li{ data: { qa_selector: 'email_row_content' } } = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? } %span.float-right diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 3e41f107e04..b1470520eea 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -71,7 +71,7 @@ placeholder: s_("Profiles|What's your status?") .checkbox-icon-inline-wrapper = status_form.check_box :availability, { data: { testid: "user-availability-checkbox" }, label: s_("Profiles|Busy"), wrapper_class: 'gl-mr-0 gl-font-weight-bold' }, availability["busy"], availability["not_set"] - .gl-text-gray-600.gl-ml-5= s_('Profiles|"Busy" will be shown next to your name') + .gl-text-gray-600.gl-ml-5= s_('Profiles|An indicator appears next to your name and avatar') .col-lg-12 %hr .row.user-time-preferences.js-search-settings-section diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 00df8608957..0eae3c95bf6 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -43,7 +43,9 @@ .gl-alert.gl-alert-danger.gl-mb-5 .gl-alert-container .gl-alert-content - = @error + %p.gl-alert-body.gl-md-0 + = @error[:message] + = link_to _('Try the troubleshooting steps here.'), help_page_path('user/profile/account/two_factor_authentication.md', anchor: 'troubleshooting'), target: '_blank', rel: 'noopener noreferrer' .form-group = label_tag :pin_code, _('Pin code'), class: "label-bold" = text_field_tag :pin_code, nil, class: "form-control gl-form-input", required: true, data: { qa_selector: 'pin_code_field' } |