Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

3 files changed, 8 insertions, 4 deletions

diff --git a/app/views/snippets/_snippets_scope_menu.html.haml b/app/views/snippets/_snippets_scope_menu.html.haml
index e9c9ca6e856..ac6dac8b322 100644
--- a/app/views/snippets/_snippets_scope_menu.html.haml
+++ b/app/views/snippets/_snippets_scope_menu.html.haml
@@ -5,7 +5,7 @@
   %li{ class: active_when(params[:scope].nil?) }
     = link_to subject_snippets_path(subject) do
       = _("All")
-      %span.badge.badge-pill
+      %span.badge.badge-muted.badge-pill.gl-badge.sm
         - if include_private
           = counts[:total]
         - else
@@ -15,17 +15,17 @@
     %li{ class: active_when(params[:scope] == "are_private") }
       = link_to subject_snippets_path(subject, scope: 'are_private') do
         = _("Private")
-        %span.badge.badge-pill
+        %span.badge.badge-muted.badge-pill.gl-badge.sm
           = counts[:are_private]
 
   %li{ class: active_when(params[:scope] == "are_internal") }
     = link_to subject_snippets_path(subject, scope: 'are_internal') do
       = _("Internal")
-      %span.badge.badge-pill
+      %span.badge.badge-muted.badge-pill.gl-badge.sm
         = counts[:are_internal]
 
   %li{ class: active_when(params[:scope] == "are_public") }
     = link_to subject_snippets_path(subject, scope: 'are_public') do
       = _("Public")
-      %span.badge.badge-pill
+      %span.badge.badge-muted.badge-pill.gl-badge.sm
         = counts[:are_public]
diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml
index 66f5e8148e1..f737e347c39 100644
--- a/app/views/snippets/edit.html.haml
+++ b/app/views/snippets/edit.html.haml
@@ -1,5 +1,7 @@
 - page_title _("Edit"), "#{@snippet.title} (#{@snippet.to_reference})", _("Snippets")
 - @content_class = "limit-container-width" unless fluid_layout
+- content_for :prefetch_asset_tags do
+  - webpack_preload_asset_tag('monaco')
 
 %h3.page-title
   = _("Edit Snippet")
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index beb4cf4a6aa..4fdb9e70742 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -9,6 +9,8 @@
 - add_to_breadcrumbs _("Snippets"), dashboard_snippets_path
 - breadcrumb_title @snippet.to_reference
 - page_title "#{@snippet.title} (#{@snippet.to_reference})", _("Snippets")
+- content_for :prefetch_asset_tags do
+  - webpack_preload_asset_tag('monaco', prefetch: true)
 
 #js-snippet-view{ data: {'qa-selector': 'snippet_view', 'snippet-gid': @snippet.to_global_id} }