Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 17 insertions, 11 deletions

diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml
index c567b453bf2..4093f0a0719 100644
--- a/app/views/projects/runners/_shared_runners.html.haml
+++ b/app/views/projects/runners/_shared_runners.html.haml
@@ -1,16 +1,22 @@
+- isVueifySharedRunnersToggleEnabled = Feature.enabled?(:vueify_shared_runners_toggle, @project)
+
 = render layout: 'shared/runners/shared_runners_description' do
-  %hr
-  - if @project.group&.shared_runners_setting == 'disabled_and_unoverridable'
-    %h5.gl-text-red-500
-      = _('Shared runners disabled on group level')
-  - else
-    - if @project.shared_runners_enabled?
-      = link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-close', method: :post do
-        = _('Disable shared runners')
+  - if !isVueifySharedRunnersToggleEnabled
+    %hr
+    - if @project.group&.shared_runners_setting == 'disabled_and_unoverridable'
+      %h5.gl-text-red-500
+        = _('Shared runners disabled on group level')
     - else
-      = link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-success', method: :post do
-        = _('Enable shared runners')
-      for this project
+      - if @project.shared_runners_enabled?
+        = link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-close', method: :post do
+          = _('Disable shared runners')
+      - else
+        = link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-success', method: :post do
+          = _('Enable shared runners')
+        for this project
+
+- if isVueifySharedRunnersToggleEnabled
+  #toggle-shared-runners-form{ data: toggle_shared_runners_settings_data(@project) }
 
 - if @shared_runners_count == 0
   = _('This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.')