diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-11 09:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-11 09:09:37 +0300 |
| commit | a031b1f4f34470fba578856dc7ab735a6f54733a (patch) | |
| tree | 079aa62c122c4bfca6254d2fc8f2546082bdec5e /app | |
| parent | c1cd7dc4a3fd3c15f7a2c5ececaf13612333d737 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js | 1 | ||||
| -rw-r--r-- | app/views/groups/show.html.haml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js b/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js index 1f31cd11aee..9ecae87c1a9 100644 --- a/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js +++ b/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', diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index a9c19502a7c..e1cda7dbacd 100644 --- a/app/views/groups/show.html.haml +++ b/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") |