Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 52 deletions

diff --git a/app/controllers/groups/runners_controller.rb b/app/controllers/groups/runners_controller.rb
index a2be4d9d7e1..d8dce7a8e6d 100644
--- a/app/controllers/groups/runners_controller.rb
+++ b/app/controllers/groups/runners_controller.rb
@@ -3,7 +3,6 @@
 class Groups::RunnersController < Groups::ApplicationController
   before_action :authorize_read_group_runners!, only: [:index, :show]
   before_action :authorize_admin_group_runners!, only: [:edit, :update, :destroy, :pause, :resume]
-  before_action :runner_list_group_view_vue_ui_enabled, only: [:index]
   before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
 
   feature_category :runner
@@ -15,10 +14,6 @@ class Groups::RunnersController < Groups::ApplicationController
     Gitlab::Tracking.event(self.class.name, 'index', user: current_user, namespace: @group)
   end
 
-  def runner_list_group_view_vue_ui_enabled
-    render_404 unless Feature.enabled?(:runner_list_group_view_vue_ui, group, default_enabled: :yaml)
-  end
-
   def show
   end
 
@@ -33,32 +28,6 @@ class Groups::RunnersController < Groups::ApplicationController
     end
   end
 
-  def destroy
-    if can?(current_user, :delete_runner, @runner)
-      Ci::Runners::UnregisterRunnerService.new(@runner, current_user).execute
-
-      redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), status: :found
-    else
-      redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), status: :found, alert: _('Runner cannot be deleted, please contact your administrator.')
-    end
-  end
-
-  def resume
-    if Ci::Runners::UpdateRunnerService.new(@runner).update(active: true)
-      redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), notice: _('Runner was successfully updated.')
-    else
-      redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), alert: _('Runner was not updated.')
-    end
-  end
-
-  def pause
-    if Ci::Runners::UpdateRunnerService.new(@runner).update(active: false)
-      redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), notice: _('Runner was successfully updated.')
-    else
-      redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), alert: _('Runner was not updated.')
-    end
-  end
-
   private
 
   def runner
diff --git a/app/controllers/groups/settings/ci_cd_controller.rb b/app/controllers/groups/settings/ci_cd_controller.rb
index 9b9e3f7b0bc..a5a624145fd 100644
--- a/app/controllers/groups/settings/ci_cd_controller.rb
+++ b/app/controllers/groups/settings/ci_cd_controller.rb
@@ -3,8 +3,6 @@
 module Groups
   module Settings
     class CiCdController < Groups::ApplicationController
-      include RunnerSetupScripts
-
       layout 'group_settings'
       skip_cross_project_access_check :show
       before_action :authorize_admin_group!
@@ -14,15 +12,7 @@ module Groups
 
       feature_category :continuous_integration
 
-      NUMBER_OF_RUNNERS_PER_PAGE = 4
-
       def show
-        runners_finder = Ci::RunnersFinder.new(current_user: current_user, params: params.merge({ group: @group }))
-        # We need all runners for count
-        @all_group_runners = runners_finder.execute.except(:limit, :offset)
-        @group_runners = runners_finder.execute.page(params[:page]).per(NUMBER_OF_RUNNERS_PER_PAGE)
-
-        @sort = runners_finder.sort_key
       end
 
       def update
@@ -35,13 +25,6 @@ module Groups
         redirect_to group_settings_ci_cd_path
       end
 
-      def reset_registration_token
-        ::Ci::Runners::ResetRegistrationTokenService.new(@group, current_user).execute
-
-        flash[:notice] = _('GroupSettings|New runners registration token has been generated!')
-        redirect_to group_settings_ci_cd_path
-      end
-
       def update_auto_devops
         if auto_devops_service.execute
           flash[:notice] = s_('GroupSettings|Auto DevOps pipeline was updated for the group')
@@ -52,10 +35,6 @@ module Groups
         redirect_to group_settings_ci_cd_path
       end
 
-      def runner_setup_scripts
-        private_runner_setup_scripts
-      end
-
       private
 
       def define_variables
diff --git a/app/controllers/groups/uploads_controller.rb b/app/controllers/groups/uploads_controller.rb
index 49249f87d31..22e6549aa04 100644
--- a/app/controllers/groups/uploads_controller.rb
+++ b/app/controllers/groups/uploads_controller.rb
@@ -10,6 +10,7 @@ class Groups::UploadsController < Groups::ApplicationController
   before_action :verify_workhorse_api!, only: [:authorize]
 
   feature_category :subgroups
+  urgency :low, [:show]
 
   private