This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

Commit feabf02a authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@13-4-stable-ee

parent 240329402620
......@@ -262,6 +262,38 @@
content: '\f127';
}
.fa-file-pdf-o::before {
content: '\f1c1';
}
.fa-file-word-o::before {
content: '\f1c2';
}
.fa-file-excel-o::before {
content: '\f1c3';
}
.fa-file-powerpoint-o::before {
content: '\f1c4';
}
.fa-file-image-o::before {
content: '\f1c5';
}
.fa-file-archive-o::before {
content: '\f1c6';
}
.fa-file-audio-o::before {
content: '\f1c7';
}
.fa-file-video-o::before {
content: '\f1c8';
}
.sr-only {
position: absolute;
width: 1px;
......
......@@ -29,7 +29,10 @@ def notification_icon_level(notification_setting, emails_disabled = false)
end
def notification_icon(level)
sprite_icon("#{notification_icon_class(level)}")
icon = notification_icon_class(level)
return '' unless icon
sprite_icon(icon)
end
def notification_title(level)
......
......@@ -10,7 +10,7 @@ class Runner < ApplicationRecord
include TokenAuthenticatable
include IgnorableColumns
add_authentication_token_field :token, encrypted: -> { Feature.enabled?(:ci_runners_tokens_optional_encryption) ? :optional : :required }
add_authentication_token_field :token, encrypted: -> { Feature.enabled?(:ci_runners_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
enum access_level: {
not_protected: 0,
......
---
title: 'Notifications icon: Render empty string for custom setting'
merge_request: 42848
author:
type: other
---
title: Add missing fontawesome file icon classes
merge_request: 43091
author:
type: added
---
title: Revert required encryption on CI runner tokens
merge_request: 42623
author:
type: fixed
---
title: Allow Unleash clients to request feature flags when repository is private
merge_request: 43059
author:
type: fixed
---
name: ci_runners_tokens_optional_encryption
introduced_by_url:
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/cbba8fe02b0ea3adabcfe18685c9af6be3859e2d
rollout_issue_url:
group:
group: group::continuous integration
type: development
default_enabled: false
default_enabled: true
......@@ -26728,6 +26728,9 @@ msgstr ""
msgid "Total cores (CPUs)"
msgstr ""
 
msgid "Total days to completion"
msgstr ""
msgid "Total issues"
msgstr ""
 
......
......@@ -10,6 +10,7 @@
it { expect(notification_icon(:mention)).to match('data-testid="at-icon"') }
it { expect(notification_icon(:global)).to match('data-testid="earth-icon') }
it { expect(notification_icon(:watch)).to match('data-testid="eye-icon"') }
it { expect(notification_icon(:custom)).to equal('') }
end
describe 'notification_title' do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment