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

3 files changed, 37 insertions, 2 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,