diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-11 00:10:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-11 00:10:47 +0000 |
| commit | 3348759f6c023f5c95cae57cb9c8e17bea30384c (patch) | |
| tree | 8bda3a1e5f63532b0c88112ffbb675812c01b8a1 /app | |
| parent | eb6bf4a5d66bdfd50d29dab2ec2d1f643226952c (diff) | |
| download | gitlab-ce-3348759f6c023f5c95cae57cb9c8e17bea30384c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue index fac20137e1c..095d1854c8b 100644 --- a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue +++ b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue @@ -71,7 +71,7 @@ export default { class="item-contents gl-display-flex gl-align-items-center gl-flex-wrap gl-flex-grow-1 flex-xl-nowrap gl-min-h-7" > <!-- Title area: Status icon (XL) and title --> - <div class="item-title d-flex align-items-xl-center mb-xl-0"> + <div class="item-title d-flex align-items-xl-center mb-xl-0 gl-min-w-0"> <div ref="iconElementXL"> <gl-icon v-if="hasState" diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml index 0c05ee4a6cd..a8f1d89f21e 100644 --- a/app/views/devise/mailer/unlock_instructions.html.haml +++ b/app/views/devise/mailer/unlock_instructions.html.haml @@ -1,6 +1,8 @@ #content = email_default_heading(_("Hello, %{name}!") % { name: @resource.name }) %p - = _("Your GitLab account has been locked due to an excessive amount of unsuccessful sign in attempts. Your account will automatically unlock in %{duration} or you may click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) } + = _("Your GitLab account has been locked due to an excessive number of unsuccessful sign in attempts. You can wait for your account to automatically unlock in %{duration} or you can click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) } #cta = link_to(_('Unlock account'), unlock_url(@resource, unlock_token: @token)) + %p + = _('If you did not initiate these sign-in attempts, please reach out to your administrator or enable two-factor authentication (2FA) on your account.') diff --git a/app/views/devise/mailer/unlock_instructions.text.erb b/app/views/devise/mailer/unlock_instructions.text.erb index 9b1e2166cee..d58bb8facc3 100644 --- a/app/views/devise/mailer/unlock_instructions.text.erb +++ b/app/views/devise/mailer/unlock_instructions.text.erb @@ -1,5 +1,7 @@ <%= _('Hello, %{name}!') % { name: @resource.name } %> -<%= _("Your GitLab account has been locked due to an excessive amount of unsuccessful sign in attempts. Your account will automatically unlock in %{duration} or you may click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) } %> +<%= _("Your GitLab account has been locked due to an excessive number of unsuccessful sign in attempts. You can wait for your account to automatically unlock in %{duration} or you can click the link below to unlock now.") % { duration: distance_of_time_in_words(Devise.unlock_in) } %> <%= unlock_url(@resource, unlock_token: @token) %> + +<%= _('If you did not initiate these sign-in attempts, please reach out to your administrator or enable two-factor authentication (2FA) on your account.') %> |