From 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Jun 2020 11:18:50 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-1-stable-ee --- app/views/profiles/_event_table.html.haml | 2 +- app/views/profiles/accounts/show.html.haml | 8 ++++---- app/views/profiles/active_sessions/index.html.haml | 2 +- app/views/profiles/audit_log.html.haml | 2 +- app/views/profiles/chat_names/index.html.haml | 2 +- app/views/profiles/emails/index.html.haml | 6 +++--- app/views/profiles/gpg_keys/index.html.haml | 4 ++-- app/views/profiles/keys/index.html.haml | 4 ++-- app/views/profiles/notifications/show.html.haml | 4 ++-- app/views/profiles/passwords/edit.html.haml | 4 ++-- app/views/profiles/personal_access_tokens/index.html.haml | 8 ++++---- app/views/profiles/preferences/_sourcegraph.html.haml | 2 +- app/views/profiles/preferences/show.html.haml | 10 +++++----- app/views/profiles/show.html.haml | 10 +++++----- app/views/profiles/two_factor_auths/show.html.haml | 12 ++++++------ 15 files changed, 40 insertions(+), 40 deletions(-) (limited to 'app/views/profiles') diff --git a/app/views/profiles/_event_table.html.haml b/app/views/profiles/_event_table.html.haml index 977ff30d5a6..c65c4fd0d81 100644 --- a/app/views/profiles/_event_table.html.haml +++ b/app/views/profiles/_event_table.html.haml @@ -1,4 +1,4 @@ -%h5.prepend-top-0 +%h5.gl-mt-0 = _('History of authentications') %ul.content-list diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index e6380817c8f..f4a97206a19 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -7,7 +7,7 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('Profiles|Two-Factor Authentication') %p = s_("Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)") @@ -24,7 +24,7 @@ - if display_providers_on_profile? .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('Profiles|Social sign-in') %p = s_('Profiles|Activate signin with one of the following services') @@ -34,7 +34,7 @@ - if current_user.can_change_username? .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0.warning-title + %h4.gl-mt-0.warning-title = s_('Profiles|Change username') %p = s_('Profiles|Changing your username can have unintended side effects.') @@ -47,7 +47,7 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0.danger-title + %h4.gl-mt-0.danger-title = s_('Profiles|Delete account') .col-lg-8 - if current_user.can_be_removed? && can?(current_user, :destroy_user, current_user) diff --git a/app/views/profiles/active_sessions/index.html.haml b/app/views/profiles/active_sessions/index.html.haml index d651319fc3f..6d01d055f0c 100644 --- a/app/views/profiles/active_sessions/index.html.haml +++ b/app/views/profiles/active_sessions/index.html.haml @@ -3,7 +3,7 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = _('This is a list of devices that have logged into your account. Revoke any sessions that you do not recognize.') diff --git a/app/views/profiles/audit_log.html.haml b/app/views/profiles/audit_log.html.haml index 275c0428d34..02aadcc5c8b 100644 --- a/app/views/profiles/audit_log.html.haml +++ b/app/views/profiles/audit_log.html.haml @@ -3,7 +3,7 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = _('This is a security log of important events involving your account.') diff --git a/app/views/profiles/chat_names/index.html.haml b/app/views/profiles/chat_names/index.html.haml index 0c8098a97d5..05870e0e221 100644 --- a/app/views/profiles/chat_names/index.html.haml +++ b/app/views/profiles/chat_names/index.html.haml @@ -3,7 +3,7 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = _('You can see your chat accounts.') diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index e28c74dd650..e90bda0e187 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -3,12 +3,12 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = _('Control emails linked to your account') .col-lg-8 - %h4.prepend-top-0 + %h4.gl-mt-0 = _('Add email address') = form_for 'email', url: profile_emails_path do |f| .form-group @@ -17,7 +17,7 @@ .prepend-top-default = f.submit _('Add email address'), class: 'btn btn-success', data: { qa_selector: 'add_email_address_button' } %hr - %h4.prepend-top-0 + %h4.gl-mt-0 = _('Linked emails (%{email_count})') % { email_count: @emails.load.size + 1 } .account-well.append-bottom-default %ul diff --git a/app/views/profiles/gpg_keys/index.html.haml b/app/views/profiles/gpg_keys/index.html.haml index f9f898a9225..31610e7505b 100644 --- a/app/views/profiles/gpg_keys/index.html.haml +++ b/app/views/profiles/gpg_keys/index.html.haml @@ -3,12 +3,12 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = _('GPG keys allow you to verify signed commits.') .col-lg-8 - %h5.prepend-top-0 + %h5.gl-mt-0 = _('Add a GPG key') %p.profile-settings-content - help_link_start = ''.html_safe % { url: help_page_path('user/project/repository/gpg_signed_commits/index.md') } diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml index da6aa0fce3a..788c67b3704 100644 --- a/app/views/profiles/keys/index.html.haml +++ b/app/views/profiles/keys/index.html.haml @@ -3,12 +3,12 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = _('SSH keys allow you to establish a secure connection between your computer and GitLab.') .col-lg-8 - %h5.prepend-top-0 + %h5.gl-mt-0 = _('Add an SSH key') %p.profile-settings-content - generate_link_url = help_page_path("ssh/README", anchor: 'generating-a-new-ssh-key-pair') diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index 73f6a821b51..498f80aed2b 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -11,14 +11,14 @@ = hidden_field_tag :notification_type, 'global' .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = _('You can specify notification level per group or per project.') %p = _('By default, all projects and groups will use the global notifications setting.') .col-lg-8 - %h5.prepend-top-0 + %h5.gl-mt-0 = _('Global notification settings') = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f| diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index af6fa6b1b61..9deaf7f84be 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -4,12 +4,12 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = _('After a successful password update, you will be redirected to the login page where you can log in with your new password.') .col-lg-8 - %h5.prepend-top-0 + %h5.gl-mt-0 - if @user.password_automatically_set = _('Change your password') - else diff --git a/app/views/profiles/personal_access_tokens/index.html.haml b/app/views/profiles/personal_access_tokens/index.html.haml index 81b22d964a5..769502e0026 100644 --- a/app/views/profiles/personal_access_tokens/index.html.haml +++ b/app/views/profiles/personal_access_tokens/index.html.haml @@ -6,7 +6,7 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = page_title %p = s_('AccessTokens|You can generate a personal access token for each application you use that needs access to the GitLab API.') @@ -35,7 +35,7 @@ %hr .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('AccessTokens|Feed token') %p = s_('AccessTokens|Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when your calendar application loads a personalized calendar, and is included in those feed URLs.') @@ -53,7 +53,7 @@ %hr .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('AccessTokens|Incoming email token') %p = s_('AccessTokens|Your incoming email token is used to authenticate you when you create a new issue by email, and is included in your personal project-specific email addresses.') @@ -71,7 +71,7 @@ %hr .row.prepend-top-default .col-lg-4 - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('AccessTokens|Static object token') %p = s_('AccessTokens|Your static object token is used to authenticate you when repository static objects (e.g. archives, blobs, ...) are being served from an external storage.') diff --git a/app/views/profiles/preferences/_sourcegraph.html.haml b/app/views/profiles/preferences/_sourcegraph.html.haml index 20a904694ca..7328d36b0fb 100644 --- a/app/views/profiles/preferences/_sourcegraph.html.haml +++ b/app/views/profiles/preferences/_sourcegraph.html.haml @@ -5,7 +5,7 @@ %hr .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('Preferences|Integrations') %p = s_('Preferences|Customize integrations with third party services.') diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 12d42ce9892..cc44d137848 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -3,7 +3,7 @@ = form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f| .col-lg-4.application-theme - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('Preferences|Navigation theme') %p = s_('Preferences|Customize the appearance of the application header and navigation sidebar.') @@ -18,7 +18,7 @@ %hr .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('Preferences|Syntax highlighting theme') %p = s_('Preferences|This setting allows you to customize the appearance of the syntax.') @@ -35,7 +35,7 @@ %hr .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_('Preferences|Behavior') %p = s_('Preferences|This setting allows you to customize the behavior of the system layout and default views.') @@ -83,7 +83,7 @@ %hr .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = _('Localization') %p = _('Customize language and region related settings.') @@ -104,7 +104,7 @@ .col-sm-12 %hr .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0= s_('Preferences|Time preferences') + %h4.gl-mt-0= s_('Preferences|Time preferences') %p= s_('Preferences|These settings will update how dates and times are displayed for you.') .col-lg-8 .form-group diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 43fc9150e99..78fdcdef3c4 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -7,7 +7,7 @@ .row .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_("Profiles|Public Avatar") %p - if @user.avatar? @@ -27,7 +27,7 @@ .clearfix.avatar-image.append-bottom-default = link_to avatar_icon_for_user(@user, 400), target: '_blank', rel: 'noopener noreferrer' do = image_tag avatar_icon_for_user(@user, 160), alt: '', class: 'avatar s160' - %h5.prepend-top-0= s_("Profiles|Upload new avatar") + %h5.gl-mt-0= s_("Profiles|Upload new avatar") .prepend-top-5.append-bottom-10 %button.btn.js-choose-user-avatar-button{ type: 'button' }= s_("Profiles|Choose file...") %span.avatar-file-name.prepend-left-default.js-avatar-filename= s_("Profiles|No file chosen") @@ -40,7 +40,7 @@ %hr .row .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0= s_("Profiles|Current status") + %h4.gl-mt-0= s_("Profiles|Current status") %p= s_("Profiles|This emoji and message will appear on your profile and throughout the interface.") .col-lg-8 = f.fields_for :status, @user.status do |status_form| @@ -71,7 +71,7 @@ %hr .row.user-time-preferences .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0= s_("Profiles|Time settings") + %h4.gl-mt-0= s_("Profiles|Time settings") %p= s_("Profiles|You can set your current timezone here") .col-lg-8 -# TODO: might need an entry in user/profile.md to describe some of these settings @@ -83,7 +83,7 @@ %hr .row .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 + %h4.gl-mt-0 = s_("Profiles|Main settings") %p = s_("Profiles|This information will appear on your profile") diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 4a2d0a4f8ce..7e566361848 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -5,7 +5,7 @@ .js-two-factor-auth{ 'data-two-factor-skippable' => "#{two_factor_skippable?}", 'data-two_factor_skip_url' => skip_profile_two_factor_auth_path } .row.prepend-top-default .col-lg-4 - %h4.prepend-top-0 + %h4.gl-mt-0 = _('Register Two-Factor Authenticator') %p = _('Use an one time password authenticator on your mobile device or computer to enable two-factor authentication (2FA).') @@ -33,13 +33,13 @@ = raw @qr_code .col-md-8 .account-well - %p.prepend-top-0.append-bottom-0 + %p.gl-mt-0.gl-mb-0 = _("Can't scan the code?") - %p.prepend-top-0.append-bottom-0 + %p.gl-mt-0.gl-mb-0 = _('To add the entry manually, provide the following details to the application on your phone.') - %p.prepend-top-0.append-bottom-0 + %p.gl-mt-0.gl-mb-0 = _('Account: %{account}') % { account: @account_string } - %p.prepend-top-0.append-bottom-0 + %p.gl-mt-0.gl-mb-0 = _('Key: %{key}') %{ key: current_user.otp_secret.scan(/.{4}/).join(' ') } %p.two-factor-new-manual-content = _('Time based: Yes') @@ -57,7 +57,7 @@ .row.prepend-top-default .col-lg-4 - %h4.prepend-top-0 + %h4.gl-mt-0 = _('Register Universal Two-Factor (U2F) Device') %p = _('Use a hardware device to add the second factor of authentication.') -- cgit v1.2.3