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

10 files changed, 64 insertions, 5 deletions

diff --git a/app/assets/stylesheets/fontawesome_custom.scss b/app/assets/stylesheets/fontawesome_custom.scss
index 30d56d99e1c..46e5e5a28ea 100644
--- a/app/assets/stylesheets/fontawesome_custom.scss
+++ b/app/assets/stylesheets/fontawesome_custom.scss
@@ -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;
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 784b242e2b5..542a9ad2a70 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -29,7 +29,10 @@ module NotificationsHelper
   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)
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 86879b9dc68..44a00e36bcc 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -10,7 +10,7 @@ module Ci
     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,
diff --git a/changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml b/changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml
new file mode 100644
index 00000000000..1250aa860dc
--- /dev/null
+++ b/changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml
@@ -0,0 +1,5 @@
+---
+title: 'Notifications icon: Render empty string for custom setting'
+merge_request: 42848
+author:
+type: other
diff --git a/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml b/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml
new file mode 100644
index 00000000000..8ad7010c0ee
--- /dev/null
+++ b/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml
@@ -0,0 +1,5 @@
+---
+title: Add missing fontawesome file icon classes
+merge_request: 43091
+author:
+type: added
diff --git a/changelogs/unreleased/revert-a6875e5f.yml b/changelogs/unreleased/revert-a6875e5f.yml
new file mode 100644
index 00000000000..ea8135346f2
--- /dev/null
+++ b/changelogs/unreleased/revert-a6875e5f.yml
@@ -0,0 +1,5 @@
+---
+title: Revert required encryption on CI runner tokens
+merge_request: 42623
+author:
+type: fixed
diff --git a/changelogs/unreleased/unleash-api-with-private-repo.yml b/changelogs/unreleased/unleash-api-with-private-repo.yml
new file mode 100644
index 00000000000..3dcdfcdd899
--- /dev/null
+++ b/changelogs/unreleased/unleash-api-with-private-repo.yml
@@ -0,0 +1,5 @@
+---
+title: Allow Unleash clients to request feature flags when repository is private
+merge_request: 43059
+author:
+type: fixed
diff --git a/config/feature_flags/development/ci_runners_tokens_optional_encryption.yml b/config/feature_flags/development/ci_runners_tokens_optional_encryption.yml
index 76689452b2a..52aed3378ff 100644
--- a/config/feature_flags/development/ci_runners_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/ci_runners_tokens_optional_encryption.yml
@@ -1,7 +1,7 @@
 ---
 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
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d1a09d9fa8b..46b7dac4745 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -26728,6 +26728,9 @@ msgstr ""
 msgid "Total cores (CPUs)"
 msgstr ""
 
+msgid "Total days to completion"
+msgstr ""
+
 msgid "Total issues"
 msgstr ""
 
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
index 176585e2ded..5e37e56c612 100644
--- a/spec/helpers/notifications_helper_spec.rb
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe NotificationsHelper do
     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