diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 15:08:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 15:08:55 +0300 |
| commit | ea1dcaef18edf97b3ac73892d64ebaf5eecd7f68 (patch) | |
| tree | 4ffca65c5590a6bb6ea6f72efda3feaf7be45ec2 /app/controllers | |
| parent | 2c6c1c4dce92b5ef64c357156c9a27656e8bdbb8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
4 files changed, 4 insertions, 5 deletions
diff --git a/app/controllers/concerns/runner_setup_scripts.rb b/app/controllers/concerns/runner_setup_scripts.rb index c0e657a32d1..ccae15b824f 100644 --- a/app/controllers/concerns/runner_setup_scripts.rb +++ b/app/controllers/concerns/runner_setup_scripts.rb @@ -5,8 +5,8 @@ module RunnerSetupScripts private - def private_runner_setup_scripts(**kwargs) - instructions = Gitlab::Ci::RunnerInstructions.new(current_user: current_user, os: script_params[:os], arch: script_params[:arch], **kwargs) + def private_runner_setup_scripts + instructions = Gitlab::Ci::RunnerInstructions.new(os: script_params[:os], arch: script_params[:arch]) output = { install: instructions.install_script, register: instructions.register_command diff --git a/app/controllers/groups/settings/ci_cd_controller.rb b/app/controllers/groups/settings/ci_cd_controller.rb index 242bc07fe46..e79d43dba93 100644 --- a/app/controllers/groups/settings/ci_cd_controller.rb +++ b/app/controllers/groups/settings/ci_cd_controller.rb @@ -52,7 +52,7 @@ module Groups end def runner_setup_scripts - private_runner_setup_scripts(group: group) + private_runner_setup_scripts end private diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 4f9d88da503..e1f2c0ec7a9 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -30,7 +30,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action :check_user_can_push_to_source_branch!, only: [:rebase] before_action only: [:show] do push_frontend_feature_flag(:file_identifier_hash) - push_frontend_feature_flag(:batch_suggestions, @project, default_enabled: true) push_frontend_feature_flag(:approvals_commented_by, @project, default_enabled: true) push_frontend_feature_flag(:merge_request_widget_graphql, @project, default_enabled: :yaml) push_frontend_feature_flag(:drag_comment_selection, @project, default_enabled: true) diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 04a2d6229fc..1a465406660 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -62,7 +62,7 @@ module Projects end def runner_setup_scripts - private_runner_setup_scripts(project: @project) + private_runner_setup_scripts end private |