diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/views/groups/runners | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/views/groups/runners')
-rw-r--r-- | app/views/groups/runners/_index.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/runners/_shared_runners.html.haml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/views/groups/runners/_index.html.haml b/app/views/groups/runners/_index.html.haml index e885fcc08eb..b342b589d93 100644 --- a/app/views/groups/runners/_index.html.haml +++ b/app/views/groups/runners/_index.html.haml @@ -7,6 +7,8 @@ .row .col-sm-6 = render 'groups/runners/group_runners' + .col-sm-6 + = render 'groups/runners/shared_runners' %h4.underlined-title = _('Available Runners: %{runners}').html_safe % { runners: limited_counter_with_delimiter(@all_group_runners) } diff --git a/app/views/groups/runners/_shared_runners.html.haml b/app/views/groups/runners/_shared_runners.html.haml new file mode 100644 index 00000000000..15b1199b8c9 --- /dev/null +++ b/app/views/groups/runners/_shared_runners.html.haml @@ -0,0 +1,3 @@ += render 'shared/runners/shared_runners_description' + +#update-shared-runners-form{ data: group_shared_runners_settings_data(@group) } |