Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js

@@ -493,6 +493,7 @@ const fileNameIcons = {
   '.npmignore': 'npm',
   '.npmrc': 'npm',
   '.yarnrc': 'yarn',
+  '.yarnrc.yml': 'yarn',
   'yarn.lock': 'yarn',
   '.yarnclean': 'yarn',
   '.yarn-integrity': 'yarn',

app/views/groups/show.html.haml

@@ -1,6 +1,10 @@
 - breadcrumb_title _("Details")
 - @content_class = "limit-container-width" unless fluid_layout
 
+= content_for :flash_message do
+  - if Feature.enabled?(:subscribable_banner_subscription)
+    = render_if_exists "layouts/header/ee_subscribable_banner", subscription: true
+
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, group_url(@group, rss_url_options), title: "#{@group.name} activity")