diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-11 00:07:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-11 00:07:23 +0300 |
| commit | 99bd45e7ce7539f3a0b7f7b710f1230464367b59 (patch) | |
| tree | b5337e76c2a326b31c1890d154881ff68d388bc7 /app/views | |
| parent | 8cc4a6f23d41a1c57dc309130d2ce9ebc04d8334 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
4 files changed, 5 insertions, 10 deletions
diff --git a/app/views/notify/access_token_revoked_email.html.haml b/app/views/notify/access_token_revoked_email.html.haml index ecd2b3e84b2..780d633f184 100644 --- a/app/views/notify/access_token_revoked_email.html.haml +++ b/app/views/notify/access_token_revoked_email.html.haml @@ -2,7 +2,7 @@ = _('Hi %{username}!') % { username: sanitize_name(@user.name) } %p = html_escape(_('A personal access token, named %{code_start}%{token_name}%{code_end}, has been revoked.')) % { code_start: '<code>'.html_safe, token_name: @token_name, code_end: '</code>'.html_safe } -- if @source == 'secret_detection' +- if @source == :secret_detection = _('We found your token in a public project and have automatically revoked it to protect your account.') %p - pat_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: @target_url } diff --git a/app/views/notify/access_token_revoked_email.text.erb b/app/views/notify/access_token_revoked_email.text.erb index a0623f96488..8ddab63ae27 100644 --- a/app/views/notify/access_token_revoked_email.text.erb +++ b/app/views/notify/access_token_revoked_email.text.erb @@ -1,7 +1,7 @@ <%= _('Hi %{username}!') % { username: sanitize_name(@user.name) } %> <%= _('A personal access token, named %{token_name}, has been revoked.') % { token_name: @token_name } %> -<% if @source == 'secret_detection' %> +<% if @source == :secret_detection %> <%= _('We found your token in a public project and have automatically revoked it to protect your account.') %> <% end %> diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index 8c84f96932c..c7e780d8b4b 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,6 +1 @@ -- if milestone.expired? && !milestone.closed? - = gl_badge_tag _('Expired'), { variant: :warning }, { class: "gl-mb-2" } -- if milestone.upcoming? - = gl_badge_tag _('Upcoming'), { variant: :info }, { class: "gl-mb-2" } -- if milestone.closed? - = gl_badge_tag _('Closed'), { variant: :danger }, { class: "gl-mb-2" } += gl_badge_tag milestone_status_string(milestone), { variant: milestone_badge_variant(milestone) }, { class: 'gl-mb-2' } diff --git a/app/views/shared/milestones/_header.html.haml b/app/views/shared/milestones/_header.html.haml index 1d5f282dcf9..900c71675d9 100644 --- a/app/views/shared/milestones/_header.html.haml +++ b/app/views/shared/milestones/_header.html.haml @@ -1,6 +1,6 @@ .detail-page-header.milestone-page-header - = render Pajamas::BadgeComponent.new(variant: status_box_variant(milestone), class: 'gl-mr-3') do - = milestone_status_string(milestone) + = gl_badge_tag milestone_status_string(milestone), { variant: milestone_badge_variant(milestone) }, { class: 'gl-mr-3' } + .header-text-content %span.identifier %strong |