Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 5 insertions, 5 deletions

diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 1a465406660..3254d4129d3 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -12,7 +12,6 @@ module Projects
       before_action :define_variables
       before_action do
         push_frontend_feature_flag(:ajax_new_deploy_token, @project)
-        push_frontend_feature_flag(:vueify_shared_runners_toggle, @project)
       end
 
       helper_method :highlight_badge
@@ -119,12 +118,13 @@ module Projects
           .assignable_for(project)
           .ordered
           .page(params[:specific_page]).per(NUMBER_OF_RUNNERS_PER_PAGE)
+          .with_tags
 
-        @shared_runners = ::Ci::Runner.instance_type.active
+        @shared_runners = ::Ci::Runner.instance_type.active.with_tags
 
         @shared_runners_count = @shared_runners.count(:all)
 
-        @group_runners = ::Ci::Runner.belonging_to_parent_group_of_project(@project.id)
+        @group_runners = ::Ci::Runner.belonging_to_parent_group_of_project(@project.id).with_tags
       end
 
       def define_ci_variables
@@ -143,7 +143,7 @@ module Projects
       end
 
       def define_badges_variables
-        @ref = params[:ref] || @project.default_branch || 'master'
+        @ref = params[:ref] || @project.default_branch_or_main
 
         @badges = [Gitlab::Ci::Badge::Pipeline::Status,
                    Gitlab::Ci::Badge::Coverage::Report]
@@ -160,4 +160,4 @@ module Projects
   end
 end
 
-Projects::Settings::CiCdController.prepend_if_ee('EE::Projects::Settings::CiCdController')
+Projects::Settings::CiCdController.prepend_mod_with('Projects::Settings::CiCdController')