Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

13 files changed, 106 insertions, 165 deletions

diff --git a/app/views/groups/_invite_members_modal.html.haml b/app/views/groups/_invite_members_modal.html.haml
index 3aae81cef8d..bd53f73230e 100644
--- a/app/views/groups/_invite_members_modal.html.haml
+++ b/app/views/groups/_invite_members_modal.html.haml
@@ -1,7 +1,7 @@
 - if invite_members_allowed?(group)
   .js-invite-members-modal{ data: { id: group.id,
     name: group.name,
-    is_project: false,
+    is_project: 'false',
     access_levels: GroupMember.access_level_roles.to_json,
     default_access_level: Gitlab::Access::GUEST,
     help_link: help_page_url('user/permissions') } }
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 33cd90ce5d3..229e04a371a 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -35,8 +35,8 @@
     %button.btn.gl-button.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = s_('GroupSettings|Customize your group badges.')
-      = link_to s_('GroupSettings|Learn more about badges.'), help_page_path('user/project/badges')
+      = s_('GroupSettings|Customize this group\'s badges.')
+      = link_to s_('GroupSettings|What are badges?'), help_page_path('user/project/badges')
   .settings-content
     = render 'shared/badges/badge_settings'
 
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index a1527a74898..ab3998be009 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -3,136 +3,80 @@
 - show_invited_members = can_manage_members && @invited_members.exists?
 - show_access_requests = can_manage_members && @requesters.exists?
 - invited_active = params[:search_invited].present? || params[:invited_members_page].present?
-- vue_members_list_enabled = Feature.enabled?(:vue_group_members_list, @group, default_enabled: true)
-- filtered_search_enabled = Feature.enabled?(:group_members_filtered_search, @group, default_enabled: true)
-- current_user_is_group_owner = @group && @group.has_owner?(current_user)
-
-- form_item_label_css_class = 'label-bold gl-mr-2 gl-mb-0 gl-py-2 align-self-md-center'
 
 .js-remove-member-modal
-.project-members-page.gl-mt-3
-  %h4
-    = _('Group members')
-  %hr
-  - if can_manage_members
-    %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' }
-      %li.nav-tab{ role: 'presentation' }
-        %a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _('Invite member')
-        %li.nav-tab{ role: 'presentation' }
-          %a.nav-link{ href: '#invite-group-pane', id: 'invite-group-tab', data: { toggle: 'tab', qa_selector: 'invite_group_tab' }, role: 'tab' }= _('Invite group')
-    .tab-content.gitlab-tab-content
-      .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' }
-        = render_invite_member_for_group(@group, @group_member.access_level)
-      .tab-pane{ id: 'invite-group-pane', role: 'tabpanel' }
-        = render 'shared/members/invite_group', submit_url: group_group_links_path(@group), access_levels: GroupMember.access_level_roles, default_access_level: @group_member.access_level, group_link_field: 'shared_with_group_id', group_access_field: 'shared_group_access'
+.row.gl-mt-3
+  .col-lg-12
+    .gl-display-flex.gl-flex-wrap
+      - if can_manage_members
+        .gl-w-half.gl-xs-w-full
+          %h4
+            = _('Group members')
+          %p
+            = html_escape(_('You can invite a new member to %{strong_start}%{group_name}%{strong_end}.')) % { group_name: @group.name, strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
+        - if invite_members_allowed?(@group)
+          .gl-w-half.gl-xs-w-full
+            .gl-display-flex.gl-flex-wrap.gl-lg-justify-content-end.gl-mx-n2.gl-mb-3
+              .js-invite-members-trigger.gl-px-2.gl-sm-w-auto.gl-w-full.gl-mb-4{ data: { classes: 'btn btn-success gl-button gl-mt-3 gl-sm-w-auto gl-w-full', display_text: _('Invite members') } }
+          = render_if_exists 'groups/invite_members_modal', group: @group
+    - if can_manage_members && !invite_members_allowed?(@group)
+      %hr.gl-mt-4
+        %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' }
+          %li.nav-tab{ role: 'presentation' }
+            %a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _('Invite member')
+            %li.nav-tab{ role: 'presentation' }
+              %a.nav-link{ href: '#invite-group-pane', id: 'invite-group-tab', data: { toggle: 'tab', qa_selector: 'invite_group_tab' }, role: 'tab' }= _('Invite group')
+        .tab-content.gitlab-tab-content
+          .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' }
+            = render_invite_member_for_group(@group, @group_member.access_level)
+          .tab-pane{ id: 'invite-group-pane', role: 'tabpanel' }
+            = render 'shared/members/invite_group', submit_url: group_group_links_path(@group), access_levels: GroupMember.access_level_roles, default_access_level: @group_member.access_level, group_link_field: 'shared_with_group_id', group_access_field: 'shared_group_access'
 
-  = render_if_exists 'groups/group_members/ldap_sync'
+    = render_if_exists 'groups/group_members/ldap_sync'
 
-  %ul.nav-links.mobile-separator.nav.nav-tabs
-    %li.nav-item
-      = link_to '#tab-members', class: ['nav-link', ('active' unless invited_active)], data: { toggle: 'tab' } do
-        %span
-          = _('Members')
-        %span.badge.badge-pill= @members.total_count
-    - if @group.shared_with_group_links.any?
-      %li.nav-item
-        = link_to '#tab-groups', class: ['nav-link'] , data: { toggle: 'tab', qa_selector: 'groups_list_tab' } do
-          %span
-            = _('Groups')
-          %span.badge.badge-pill= @group.shared_with_group_links.count
-    - if show_invited_members
+    %ul.nav-links.mobile-separator.nav.nav-tabs
       %li.nav-item
-        = link_to '#tab-invited-members', class: ['nav-link', ('active' if invited_active)], data: { toggle: 'tab' } do
+        = link_to '#tab-members', class: ['nav-link', ('active' unless invited_active)], data: { toggle: 'tab' } do
           %span
-            = _('Invited')
-          %span.badge.badge-pill= @invited_members.total_count
-    - if show_access_requests
-      %li.nav-item
-        = link_to '#tab-access-requests', class: 'nav-link', data: { toggle: 'tab' } do
-          %span
-            = _('Access requests')
-          %span.badge.badge-pill= @requesters.count
-  .tab-content
-    #tab-members.tab-pane{ class: ('active' unless invited_active) }
-      .card.card-without-border
-        - unless filtered_search_enabled
-          = render 'groups/group_members/tab_pane/header' do
-            = render 'groups/group_members/tab_pane/title' do
-              = html_escape(_('Members with access to %{strong_start}%{group_name}%{strong_end}')) % { group_name: @group.name, strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
-            = form_tag group_group_members_path(@group), method: :get, class: 'user-search-form gl-display-flex gl-md-align-items-center gl-flex-wrap gl-flex-direction-column gl-md-flex-direction-row gl-mx-n3 gl-my-n3', data: { testid: 'user-search-form' } do
-              .gl-px-3.gl-py-2
-                .search-control-wrap.gl-relative
-                  = render 'shared/members/search_field'
-              - if can_manage_members
-                = render 'groups/group_members/tab_pane/form_item' do
-                  = label_tag '2fa', _('2FA'), class: form_item_label_css_class
-                  = render 'shared/members/filter_2fa_dropdown'
-              = render 'groups/group_members/tab_pane/form_item' do
-                = label_tag :sort_by, _('Sort by'), class: form_item_label_css_class
-                = render 'shared/members/sort_dropdown'
-        - if vue_members_list_enabled
-          .js-group-members-list{ data: group_members_list_data_attributes(@group, @members) }
+            = _('Members')
+          %span.badge.badge-pill= @members.total_count
+      - if @group.shared_with_group_links.any?
+        %li.nav-item
+          = link_to '#tab-groups', class: ['nav-link'] , data: { toggle: 'tab', qa_selector: 'groups_list_tab' } do
+            %span
+              = _('Groups')
+            %span.badge.badge-pill= @group.shared_with_group_links.count
+      - if show_invited_members
+        %li.nav-item
+          = link_to '#tab-invited-members', class: ['nav-link', ('active' if invited_active)], data: { toggle: 'tab' } do
+            %span
+              = _('Invited')
+            %span.badge.badge-pill= @invited_members.total_count
+      - if show_access_requests
+        %li.nav-item
+          = link_to '#tab-access-requests', class: 'nav-link', data: { toggle: 'tab' } do
+            %span
+              = _('Access requests')
+            %span.badge.badge-pill= @requesters.count
+    .tab-content
+      #tab-members.tab-pane{ class: ('active' unless invited_active) }
+        .js-group-members-list{ data: group_members_list_data_attributes(@group, @members) }
+          .loading
+            .spinner.spinner-md
+        = paginate @members, theme: 'gitlab', params: { invited_members_page: nil, search_invited: nil }
+      - if @group.shared_with_group_links.any?
+        #tab-groups.tab-pane
+          .js-group-linked-list{ data: linked_groups_list_data_attributes(@group) }
+            .loading
+              .spinner.spinner-md
+      - if show_invited_members
+        #tab-invited-members.tab-pane{ class: ('active' if invited_active) }
+          .js-group-invited-members-list{ data: group_members_list_data_attributes(@group, @invited_members) }
             .loading
               .spinner.spinner-md
-        - else
-          %ul.content-list.members-list{ data: { qa_selector: 'members_list' } }
-            = render partial: 'shared/members/member',
-                     collection: @members, as: :member,
-                     locals: { membership_source: @group,
-                               group: @group,
-                               current_user_is_group_owner: current_user_is_group_owner }
-        = paginate @members, theme: 'gitlab', params: { invited_members_page: nil, search_invited: nil }
-    - if @group.shared_with_group_links.any?
-      #tab-groups.tab-pane
-        .card.card-without-border
-          - unless filtered_search_enabled
-            = render 'groups/group_members/tab_pane/header' do
-              = render 'groups/group_members/tab_pane/title' do
-                = html_escape(_('Groups with access to %{strong_start}%{group_name}%{strong_end}')) % { group_name: @group.name, strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
-          - if vue_members_list_enabled
-            .js-group-linked-list{ data: linked_groups_list_data_attributes(@group) }
-              .loading
-                .spinner.spinner-md
-          - else
-            %ul.content-list.members-list{ data: { qa_selector: 'groups_list' } }
-              - @group.shared_with_group_links.each do |group_link|
-                = render 'shared/members/group', group_link: group_link, can_admin_member: can_manage_members, group_link_path: group_group_link_path(@group, group_link)
-    - if show_invited_members
-      #tab-invited-members.tab-pane{ class: ('active' if invited_active) }
-        .card.card-without-border
-          - unless filtered_search_enabled
-            = render 'groups/group_members/tab_pane/header' do
-              = render 'groups/group_members/tab_pane/title' do
-                = html_escape(_('Members invited to %{strong_start}%{group_name}%{strong_end}')) % { group_name: @group.name, strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
-              = form_tag group_group_members_path(@group), method: :get, class: 'user-search-form', data: { testid: 'user-search-form' } do
-                = render 'shared/members/search_field', name: 'search_invited'
-          - if vue_members_list_enabled
-            .js-group-invited-members-list{ data: group_members_list_data_attributes(@group, @invited_members) }
-              .loading
-                .spinner.spinner-md
-          - else
-            %ul.content-list.members-list
-              = render partial: 'shared/members/member',
-                       collection: @invited_members, as: :member,
-                       locals: { membership_source: @group,
-                                 group: @group,
-                                 current_user_is_group_owner: current_user_is_group_owner }
           = paginate @invited_members, param_name: 'invited_members_page', theme: 'gitlab', params: { page: nil }
-    - if show_access_requests
-      #tab-access-requests.tab-pane
-        .card.card-without-border
-          - unless filtered_search_enabled
-            = render 'groups/group_members/tab_pane/header' do
-              = render 'groups/group_members/tab_pane/title' do
-                = html_escape(_('Users requesting access to %{strong_start}%{group_name}%{strong_end}')) % { group_name: @group.name, strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe }
-          - if vue_members_list_enabled
-            .js-group-access-requests-list{ data: group_members_list_data_attributes(@group, @requesters) }
-              .loading
-                .spinner.spinner-md
-          - else
-            %ul.content-list.members-list
-              = render partial: 'shared/members/member',
-                       collection: @requesters, as: :member,
-                       locals: { membership_source: @group,
-                                 group: @group,
-                                 current_user_is_group_owner: current_user_is_group_owner }
+      - if show_access_requests
+        #tab-access-requests.tab-pane
+          .js-group-access-requests-list{ data: group_members_list_data_attributes(@group, @requesters) }
+            .loading
+              .spinner.spinner-md
diff --git a/app/views/groups/group_members/tab_pane/_form_item.html.haml b/app/views/groups/group_members/tab_pane/_form_item.html.haml
deleted file mode 100644
index 9e57d3329d7..00000000000
--- a/app/views/groups/group_members/tab_pane/_form_item.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-.gl-px-3.gl-py-3.gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row
-  = yield
diff --git a/app/views/groups/group_members/tab_pane/_header.html.haml b/app/views/groups/group_members/tab_pane/_header.html.haml
deleted file mode 100644
index a02bf90eddf..00000000000
--- a/app/views/groups/group_members/tab_pane/_header.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-.gl-display-flex.gl-md-align-items-center.gl-flex-direction-column.gl-md-flex-direction-row.row-content-block.second-block
-  = yield
diff --git a/app/views/groups/group_members/tab_pane/_title.html.haml b/app/views/groups/group_members/tab_pane/_title.html.haml
deleted file mode 100644
index c1418a5f7c8..00000000000
--- a/app/views/groups/group_members/tab_pane/_title.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%span.gl-flex-grow-1.gl-py-3.gl-pr-3
-  = yield
diff --git a/app/views/groups/registry/repositories/index.html.haml b/app/views/groups/registry/repositories/index.html.haml
index e26b8317c1c..6d0a3e03019 100644
--- a/app/views/groups/registry/repositories/index.html.haml
+++ b/app/views/groups/registry/repositories/index.html.haml
@@ -1,21 +1,20 @@
 - page_title _("Container Registry")
 - @content_class = "limit-container-width" unless fluid_layout
+- add_page_startup_graphql_call('container_registry/get_container_repositories', { fullPath: @group.full_path, first: 10, name: nil, isGroupPage: true} )
 
 %section
-  .row.registry-placeholder.prepend-bottom-10
-    .col-12
-      #js-container-registry{ data: { endpoint: group_container_registries_path(@group),
-        "help_page_path" => help_page_path('user/packages/container_registry/index'),
-        "two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'),
-        "personal_access_tokens_help_link" => help_page_path('user/profile/personal_access_tokens'),
-        "no_containers_image" => image_path('illustrations/docker-empty-state.svg'),
-        "containers_error_image" => image_path('illustrations/docker-error-state.svg'),
-        "registry_host_url_with_port" => escape_once(registry_config.host_port),
-        "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
-        "run_cleanup_policies_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'run-the-cleanup-policy-now'),
-        "cleanup_policies_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'how-the-cleanup-policy-works'),
-        "is_admin": current_user&.admin.to_s,
-        is_group_page: "true",
-        "group_path": @group.full_path,
-        "gid_prefix": container_repository_gid_prefix,
-        character_error: @character_error.to_s } }
+  #js-container-registry{ data: { endpoint: group_container_registries_path(@group),
+    "help_page_path" => help_page_path('user/packages/container_registry/index'),
+    "two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'),
+    "personal_access_tokens_help_link" => help_page_path('user/profile/personal_access_tokens'),
+    "no_containers_image" => image_path('illustrations/docker-empty-state.svg'),
+    "containers_error_image" => image_path('illustrations/docker-error-state.svg'),
+    "registry_host_url_with_port" => escape_once(registry_config.host_port),
+    "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
+    "run_cleanup_policies_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'run-the-cleanup-policy-now'),
+    "cleanup_policies_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'how-the-cleanup-policy-works'),
+    "is_admin": current_user&.admin.to_s,
+    is_group_page: "true",
+    "group_path": @group.full_path,
+    "gid_prefix": container_repository_gid_prefix,
+    character_error: @character_error.to_s } }
diff --git a/app/views/groups/runners/_group_runners.html.haml b/app/views/groups/runners/_group_runners.html.haml
index 554240b7aef..944ef3435c1 100644
--- a/app/views/groups/runners/_group_runners.html.haml
+++ b/app/views/groups/runners/_group_runners.html.haml
@@ -1,11 +1,11 @@
-- link = link_to _('Runners API'), help_page_path('api/runners.md')
+- link = link_to _('Runner API'), help_page_path('api/runners.md')
 
-%h3
-  = _('Group Runners')
+%h4
+  = _('Group runners')
 
-.bs-callout.bs-callout-warning
-  = _('GitLab Group Runners can execute code for all the projects in this group.')
-  = _('They can be managed using the %{link}.').html_safe % { link: link }
+%p
+  = _('These runners are shared across projects in this group.')
+  = _('Group runners can be managed with the %{link}.').html_safe % { link: link }
 
 -# Proper policies should be implemented per
 -# https://gitlab.com/gitlab-org/gitlab-foss/issues/45894
@@ -18,3 +18,4 @@
            locals: { registration_token: @group.runners_token,
                      type: 'group',
                      reset_token_url: reset_registration_token_group_settings_ci_cd_path }
+  %br
diff --git a/app/views/groups/runners/_index.html.haml b/app/views/groups/runners/_index.html.haml
index b342b589d93..7cbc709ecf8 100644
--- a/app/views/groups/runners/_index.html.haml
+++ b/app/views/groups/runners/_index.html.haml
@@ -2,8 +2,6 @@
 
 %hr
 
-%p.lead
-  = _('To start serving your jobs you can add Runners to your group')
 .row
   .col-sm-6
     = render 'groups/runners/group_runners'
@@ -11,7 +9,7 @@
     = render 'groups/runners/shared_runners'
 
 %h4.underlined-title
-  = _('Available Runners: %{runners}').html_safe % { runners: limited_counter_with_delimiter(@all_group_runners) }
+  = _('Available runners: %{runners}').html_safe % { runners: limited_counter_with_delimiter(@all_group_runners) }
 
 -# haml-lint:disable NoPlainNodes
 .row
diff --git a/app/views/groups/settings/_two_factor_auth.html.haml b/app/views/groups/settings/_two_factor_auth.html.haml
index d2d4c27c826..fac3df5237f 100644
--- a/app/views/groups/settings/_two_factor_auth.html.haml
+++ b/app/views/groups/settings/_two_factor_auth.html.haml
@@ -18,6 +18,6 @@
 - unless group.has_parent?
   .form-group
     .form-check
-      = f.check_box :allow_mfa_for_subgroups, class: 'form-check-input', checked: group.namespace_settings.allow_mfa_for_subgroups
+      = f.check_box :allow_mfa_for_subgroups, class: 'form-check-input', checked: group.namespace_settings&.allow_mfa_for_subgroups
       = f.label :allow_mfa_for_subgroups, class: 'form-check-label' do
         = _('Allow subgroups to set up their own two-factor authentication rules')
diff --git a/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml b/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml
index 2b5019222f8..8f1ce11ce40 100644
--- a/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml
+++ b/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml
@@ -10,6 +10,6 @@
               %strong= s_('GroupSettings|Default to Auto DevOps pipeline for all projects within this group')
               %span.badge.badge-info#auto-devops-badge= badge_for_auto_devops_scope(group)
             .form-text.text-muted
-              = s_('GroupSettings|The Auto DevOps pipeline will run if no alternative CI configuration file is found.')
-              = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank'
+              = s_('GroupSettings|The Auto DevOps pipeline runs if no alternative CI configuration file is found.')
+              = link_to _('Learn more.'), help_page_path('topics/autodevops/index.md'), target: '_blank'
       = f.submit _('Save changes'), class: 'btn btn-success gl-mt-5'
diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml
index 5b5f357dbec..4a0a92fa91f 100644
--- a/app/views/groups/settings/ci_cd/show.html.haml
+++ b/app/views/groups/settings/ci_cd/show.html.haml
@@ -31,8 +31,8 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: "button" }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _("Runners are processes that pick up and execute jobs for GitLab. Here you can register and see your Runners for this project.")
-      = link_to s_('More information'), help_page_path('ci/runners/README')
+      = _("Runners are processes that pick up and execute CI/CD jobs for GitLab.")
+      = link_to s_('How do I configure runners?'), help_page_path('ci/runners/README')
   .settings-content
     = render 'groups/runners/index'
 
@@ -47,7 +47,7 @@
       - quickstart_url = help_page_path('topics/autodevops/quick_start_guide')
       - auto_devops_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: auto_devops_url }
       - quickstart_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: quickstart_url }
-      = s_('AutoDevOps|Auto DevOps can automatically build, test, and deploy applications based on predefined continuous integration and delivery configuration. %{auto_devops_start}Learn more about Auto DevOps%{auto_devops_end} or use our %{quickstart_start}quick start guide%{quickstart_end} to get started right away.').html_safe % { auto_devops_start: auto_devops_start, auto_devops_end: '</a>'.html_safe, quickstart_start: quickstart_start, quickstart_end: '</a>'.html_safe }
+      = s_('AutoDevOps|%{auto_devops_start}Automate building, testing, and deploying%{auto_devops_end} your applications based on your continuous integration and delivery configuration. %{quickstart_start}How do I get started?%{quickstart_end}').html_safe % { auto_devops_start: auto_devops_start, auto_devops_end: '</a>'.html_safe, quickstart_start: quickstart_start, quickstart_end: '</a>'.html_safe }
 
   .settings-content
     = render 'groups/settings/ci_cd/auto_devops_form', group: @group
diff --git a/app/views/groups/settings/packages_and_registries/index.html.haml b/app/views/groups/settings/packages_and_registries/index.html.haml
new file mode 100644
index 00000000000..33719d56af1
--- /dev/null
+++ b/app/views/groups/settings/packages_and_registries/index.html.haml
@@ -0,0 +1,5 @@
+- breadcrumb_title _('Packages & Registries')
+- page_title _('Packages & Registries')
+- @content_class = 'limit-container-width' unless fluid_layout
+
+%section#js-packages-and-registries-settings