4 files changed, 22 insertions, 8 deletions
diff --git a/app/views/groups/runners/_group_runners.html.haml b/app/views/groups/runners/_group_runners.html.haml
index 49e297ee13d..1cccce9f59a 100644
--- a/app/views/groups/runners/_group_runners.html.haml
+++ b/app/views/groups/runners/_group_runners.html.haml
@@ -3,17 +3,14 @@
 %h4
   = _('Group runners')
 
-%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
 .bs-callout.help-callout
+  %p
+    = _('These runners are shared across projects in this group.')
+    = _('Group runners can be managed with the %{link}.').html_safe % { link: link }
+
   - if can?(current_user, :admin_pipeline, @group) && valid_runner_registrars.include?('group')
-    = render partial: 'ci/runner/how_to_setup_runner_automatically',
-             locals: { type: 'group',
-                       clusters_path: group_clusters_path(@group) }
     - if params[:ci_runner_templates]
       %hr
       = render partial: 'ci/runner/setup_runner_in_aws',
diff --git a/app/views/groups/runners/_settings.html.haml b/app/views/groups/runners/_settings.html.haml
index 187588f5f11..55960703f9a 100644
--- a/app/views/groups/runners/_settings.html.haml
+++ b/app/views/groups/runners/_settings.html.haml
@@ -75,7 +75,7 @@
           = button_tag class: 'clear-search hidden' do
             = sprite_icon('close', size: 16, css_class: 'clear-search-icon')
         .filter-dropdown-container
-          = render 'admin/runners/sort_dropdown'
+          = render 'groups/runners/sort_dropdown'
 
   .col-sm-3.text-right-lg
     = _('Runners currently online: %{active_runners_count}') % { active_runners_count: limited_counter_with_delimiter(@all_group_runners.online) }
@@ -96,6 +96,7 @@
         .table-section.section-10{ role: 'rowheader' }
 
       - @group_runners.each do |runner|
+        - runner = runner.present(current_user: current_user)
         = render 'groups/runners/runner', runner: runner
     = paginate @group_runners, theme: 'gitlab', :params => { :anchor => 'runners-settings' }
 - else
diff --git a/app/views/groups/runners/_sort_dropdown.html.haml b/app/views/groups/runners/_sort_dropdown.html.haml
new file mode 100644
index 00000000000..e914bd00dac
--- /dev/null
+++ b/app/views/groups/runners/_sort_dropdown.html.haml
@@ -0,0 +1,10 @@
+- sorted_by = sort_options_hash[@sort] || sort_title_created_date
+
+.dropdown.inline.gl-ml-3
+  %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' } }
+    = sorted_by
+    = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
+  %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
+    %li
+      = sortable_item(sort_title_created_date,   page_filter_path(sort: sort_value_created_date),   sorted_by)
+      = sortable_item(sort_title_contacted_date, page_filter_path(sort: sort_value_contacted_date), sorted_by)
diff --git a/app/views/groups/runners/index.html.haml b/app/views/groups/runners/index.html.haml
new file mode 100644
index 00000000000..4e7bc99b1f0
--- /dev/null
+++ b/app/views/groups/runners/index.html.haml
@@ -0,0 +1,6 @@
+- page_title s_('Runners|Runners')
+
+%h2.page-title
+  = s_('Runners|Group Runners')
+
+#js-group-runners{ data: { registration_token: @group.runners_token, group_id: @group.id } }