From cd592254d6a0bec2e413c689c0de99b19bbf93e0 Mon Sep 17 00:00:00 2001
From: Michael Allan <mb.allan@ymail.com>
Date: Fri, 13 Sep 2024 07:35:13 +0000
Subject: [PATCH] Auto-corrected app/controllers Style/EmptyMethod offences
---
.rubocop_todo/style/empty_method.yml | 36 -------------------
.../appearances_controller.rb | 3 +-
.../admin/applications_controller.rb | 3 +-
.../admin/deploy_keys_controller.rb | 6 ++--
.../admin/identities_controller.rb | 3 +-
app/controllers/admin/labels_controller.rb | 6 ++--
app/controllers/admin/topics_controller.rb | 3 +-
.../admin/usage_trends_controller.rb | 3 +-
app/controllers/concerns/boards_actions.rb | 3 +-
.../groups/milestones_controller.rb | 6 ++--
.../settings/applications_controller.rb | 3 +-
.../groups/settings/ci_cd_controller.rb | 6 ++--
.../packages_and_registries_controller.rb | 3 +-
app/controllers/help_controller.rb | 3 +-
.../import/bitbucket_server_controller.rb | 3 +-
app/controllers/import/fogbugz_controller.rb | 6 ++--
app/controllers/import/manifest_controller.rb | 3 +-
.../profiles/preferences_controller.rb | 3 +-
.../projects/alert_management_controller.rb | 3 +-
.../projects/ci/lints_controller.rb | 3 +-
.../projects/ci/pipeline_editor_controller.rb | 3 +-
.../projects/confluences_controller.rb | 3 +-
.../projects/deploy_keys_controller.rb | 3 +-
.../projects/environments_controller.rb | 6 ++--
.../projects/feature_flags_controller.rb | 6 ++--
.../feature_flags_user_lists_controller.rb | 12 +++----
.../projects/import/jira_controller.rb | 3 +-
.../projects/imports_controller.rb | 3 +-
.../projects/incidents_controller.rb | 3 +-
app/controllers/projects/jobs_controller.rb | 3 +-
app/controllers/projects/labels_controller.rb | 3 +-
.../projects/mattermosts_controller.rb | 3 +-
.../projects/pipeline_schedules_controller.rb | 6 ++--
.../packages_and_registries_controller.rb | 3 +-
.../projects/terraform_controller.rb | 3 +-
app/controllers/pwa_controller.rb | 6 ++--
app/controllers/search_controller.rb | 3 +-
37 files changed, 48 insertions(+), 132 deletions(-)
diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml
index 342c80e2a54d..28344d412058 100644
--- a/.rubocop_todo/style/empty_method.yml
+++ b/.rubocop_todo/style/empty_method.yml
@@ -2,42 +2,6 @@
# Cop supports --autocorrect.
Style/EmptyMethod:
Exclude:
- - 'app/controllers/admin/application_settings/appearances_controller.rb'
- - 'app/controllers/admin/applications_controller.rb'
- - 'app/controllers/admin/deploy_keys_controller.rb'
- - 'app/controllers/admin/identities_controller.rb'
- - 'app/controllers/admin/labels_controller.rb'
- - 'app/controllers/admin/topics_controller.rb'
- - 'app/controllers/admin/usage_trends_controller.rb'
- - 'app/controllers/concerns/boards_actions.rb'
- - 'app/controllers/groups/milestones_controller.rb'
- - 'app/controllers/groups/settings/applications_controller.rb'
- - 'app/controllers/groups/settings/ci_cd_controller.rb'
- - 'app/controllers/groups/settings/packages_and_registries_controller.rb'
- - 'app/controllers/help_controller.rb'
- - 'app/controllers/import/bitbucket_server_controller.rb'
- - 'app/controllers/import/fogbugz_controller.rb'
- - 'app/controllers/import/manifest_controller.rb'
- - 'app/controllers/profiles/preferences_controller.rb'
- - 'app/controllers/projects/alert_management_controller.rb'
- - 'app/controllers/projects/ci/lints_controller.rb'
- - 'app/controllers/projects/ci/pipeline_editor_controller.rb'
- - 'app/controllers/projects/confluences_controller.rb'
- - 'app/controllers/projects/deploy_keys_controller.rb'
- - 'app/controllers/projects/environments_controller.rb'
- - 'app/controllers/projects/feature_flags_controller.rb'
- - 'app/controllers/projects/feature_flags_user_lists_controller.rb'
- - 'app/controllers/projects/import/jira_controller.rb'
- - 'app/controllers/projects/imports_controller.rb'
- - 'app/controllers/projects/incidents_controller.rb'
- - 'app/controllers/projects/jobs_controller.rb'
- - 'app/controllers/projects/labels_controller.rb'
- - 'app/controllers/projects/mattermosts_controller.rb'
- - 'app/controllers/projects/pipeline_schedules_controller.rb'
- - 'app/controllers/projects/settings/packages_and_registries_controller.rb'
- - 'app/controllers/projects/terraform_controller.rb'
- - 'app/controllers/pwa_controller.rb'
- - 'app/controllers/search_controller.rb'
- 'app/graphql/resolvers/concerns/caching_array_resolver.rb'
- 'app/helpers/subscribable_banner_helper.rb'
- 'app/helpers/users/callouts_helper.rb'
diff --git a/app/controllers/admin/application_settings/appearances_controller.rb b/app/controllers/admin/application_settings/appearances_controller.rb
index 916f81fd4d2c..8ed77b6c37db 100644
--- a/app/controllers/admin/application_settings/appearances_controller.rb
+++ b/app/controllers/admin/application_settings/appearances_controller.rb
@@ -6,8 +6,7 @@ class Admin::ApplicationSettings::AppearancesController < Admin::ApplicationCont
feature_category :navigation
urgency :low
- def show
- end
+ def show; end
def preview_sign_in
render 'preview_sign_in', layout: 'devise'
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb
index c9419354c232..2bb665c1fe1d 100644
--- a/app/controllers/admin/applications_controller.rb
+++ b/app/controllers/admin/applications_controller.rb
@@ -19,8 +19,7 @@ def new
@application = Doorkeeper::Application.new
end
- def edit
- end
+ def edit; end
def create
@application = Applications::CreateService.new(current_user, application_params).execute(request)
diff --git a/app/controllers/admin/deploy_keys_controller.rb b/app/controllers/admin/deploy_keys_controller.rb
index 4db1ba958ed4..c9e0aa049262 100644
--- a/app/controllers/admin/deploy_keys_controller.rb
+++ b/app/controllers/admin/deploy_keys_controller.rb
@@ -7,8 +7,7 @@ class Admin::DeployKeysController < Admin::ApplicationController
feature_category :continuous_delivery
urgency :low
- def index
- end
+ def index; end
def new
@deploy_key = deploy_keys.new
@@ -23,8 +22,7 @@ def create
end
end
- def edit
- end
+ def edit; end
def update
if deploy_key.update(update_params)
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb
index 75c8a7110f66..c79840885680 100644
--- a/app/controllers/admin/identities_controller.rb
+++ b/app/controllers/admin/identities_controller.rb
@@ -32,8 +32,7 @@ def index
end
end
- def edit
- end
+ def edit; end
def update
if @identity.update(identity_params)
diff --git a/app/controllers/admin/labels_controller.rb b/app/controllers/admin/labels_controller.rb
index abed42a160e4..7128b3b6d7d1 100644
--- a/app/controllers/admin/labels_controller.rb
+++ b/app/controllers/admin/labels_controller.rb
@@ -10,15 +10,13 @@ def index
@labels = Label.templates.page(pagination_params[:page])
end
- def show
- end
+ def show; end
def new
@label = Label.new
end
- def edit
- end
+ def edit; end
def create
@label = Labels::CreateService.new(label_params).execute(template: true)
diff --git a/app/controllers/admin/topics_controller.rb b/app/controllers/admin/topics_controller.rb
index c031a4762d53..d55bd4255b0d 100644
--- a/app/controllers/admin/topics_controller.rb
+++ b/app/controllers/admin/topics_controller.rb
@@ -16,8 +16,7 @@ def new
@topic = Projects::Topic.new
end
- def edit
- end
+ def edit; end
def create
@topic = Projects::Topic.new(topic_params)
diff --git a/app/controllers/admin/usage_trends_controller.rb b/app/controllers/admin/usage_trends_controller.rb
index f88028535c10..c9f151e48a0d 100644
--- a/app/controllers/admin/usage_trends_controller.rb
+++ b/app/controllers/admin/usage_trends_controller.rb
@@ -13,8 +13,7 @@ class Admin::UsageTrendsController < Admin::ApplicationController
urgency :low
- def index
- end
+ def index; end
def tracking_namespace_source
@group
diff --git a/app/controllers/concerns/boards_actions.rb b/app/controllers/concerns/boards_actions.rb
index 42bf6c68aa71..188e77c8168f 100644
--- a/app/controllers/concerns/boards_actions.rb
+++ b/app/controllers/concerns/boards_actions.rb
@@ -36,8 +36,7 @@ def latest_visited_board
end
# Noop on FOSS
- def push_licensed_features
- end
+ def push_licensed_features; end
def board
strong_memoize(:board) do
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 5024ef488736..0c91631ab7b4 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -35,11 +35,9 @@ def create
end
end
- def show
- end
+ def show; end
- def edit
- end
+ def edit; end
def update
Milestones::UpdateService.new(@milestone.parent, current_user, milestone_params).execute(@milestone)
diff --git a/app/controllers/groups/settings/applications_controller.rb b/app/controllers/groups/settings/applications_controller.rb
index 5aea078db17f..a3282e0a5d3d 100644
--- a/app/controllers/groups/settings/applications_controller.rb
+++ b/app/controllers/groups/settings/applications_controller.rb
@@ -17,8 +17,7 @@ def index
def show; end
- def edit
- end
+ def edit; end
def create
@application = Applications::CreateService.new(current_user, application_params).execute(request)
diff --git a/app/controllers/groups/settings/ci_cd_controller.rb b/app/controllers/groups/settings/ci_cd_controller.rb
index 29ac21ebb6f4..bef7fd7060f2 100644
--- a/app/controllers/groups/settings/ci_cd_controller.rb
+++ b/app/controllers/groups/settings/ci_cd_controller.rb
@@ -95,12 +95,10 @@ def update_group_params
end
# Overridden in EE
- def push_licensed_features
- end
+ def push_licensed_features; end
# Overridden in EE
- def assign_variables_to_gon
- end
+ def assign_variables_to_gon; end
end
end
end
diff --git a/app/controllers/groups/settings/packages_and_registries_controller.rb b/app/controllers/groups/settings/packages_and_registries_controller.rb
index ec4a0b312eef..2c6f0072880e 100644
--- a/app/controllers/groups/settings/packages_and_registries_controller.rb
+++ b/app/controllers/groups/settings/packages_and_registries_controller.rb
@@ -14,8 +14,7 @@ class PackagesAndRegistriesController < Groups::ApplicationController
feature_category :package_registry
urgency :low
- def show
- end
+ def show; end
private
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 6b8a78e1bc39..f1de3663c871 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -55,8 +55,7 @@ def redirect_to_docs
redirect_to documentation_base_url || Gitlab::Saas.doc_url
end
- def shortcuts
- end
+ def shortcuts; end
def instance_configuration
@instance_configuration = InstanceConfiguration.new
diff --git a/app/controllers/import/bitbucket_server_controller.rb b/app/controllers/import/bitbucket_server_controller.rb
index 353150121c78..8790f1542573 100644
--- a/app/controllers/import/bitbucket_server_controller.rb
+++ b/app/controllers/import/bitbucket_server_controller.rb
@@ -25,8 +25,7 @@ class Import::BitbucketServerController < Import::BaseController
VALID_BITBUCKET_PROJECT_CHARS = /\A~?[\w\-\.\s]+\z/
VALID_BITBUCKET_CHARS = /\A[\w\-\.\s]+\z/
- def new
- end
+ def new; end
def create
repo = client.repo(@project_key, @repo_slug)
diff --git a/app/controllers/import/fogbugz_controller.rb b/app/controllers/import/fogbugz_controller.rb
index 571f6dfda426..dbdcbc2a2583 100644
--- a/app/controllers/import/fogbugz_controller.rb
+++ b/app/controllers/import/fogbugz_controller.rb
@@ -9,8 +9,7 @@ class Import::FogbugzController < Import::BaseController
rescue_from Fogbugz::AuthenticationException, with: :fogbugz_unauthorized
- def new
- end
+ def new; end
def callback
begin
@@ -25,8 +24,7 @@ def callback
redirect_to new_user_map_import_fogbugz_path(namespace_id: params[:namespace_id])
end
- def new_user_map
- end
+ def new_user_map; end
def create_user_map
user_map = user_map_params.to_h[:users]
diff --git a/app/controllers/import/manifest_controller.rb b/app/controllers/import/manifest_controller.rb
index 45ff679fec7d..f9074297c949 100644
--- a/app/controllers/import/manifest_controller.rb
+++ b/app/controllers/import/manifest_controller.rb
@@ -7,8 +7,7 @@ class Import::ManifestController < Import::BaseController
before_action :verify_import_enabled
before_action :ensure_import_vars, only: [:create, :status]
- def new
- end
+ def new; end
# We need to re-expose controller's internal method 'status' as action.
# rubocop:disable Lint/UselessMethodDefinition
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index c173ae40879f..0e9aff117069 100644
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -8,8 +8,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
urgency :low, [:show]
urgency :medium, [:update]
- def show
- end
+ def show; end
def update
result = Users::UpdateService.new(current_user, preferences_params.merge(user: user)).execute
diff --git a/app/controllers/projects/alert_management_controller.rb b/app/controllers/projects/alert_management_controller.rb
index ef0c47b0eed9..65c1feb34b4b 100644
--- a/app/controllers/projects/alert_management_controller.rb
+++ b/app/controllers/projects/alert_management_controller.rb
@@ -6,8 +6,7 @@ class Projects::AlertManagementController < Projects::ApplicationController
feature_category :incident_management
urgency :low
- def index
- end
+ def index; end
def details
@alert_id = params[:id]
diff --git a/app/controllers/projects/ci/lints_controller.rb b/app/controllers/projects/ci/lints_controller.rb
index 6762f1c71100..94a91d309393 100644
--- a/app/controllers/projects/ci/lints_controller.rb
+++ b/app/controllers/projects/ci/lints_controller.rb
@@ -8,8 +8,7 @@ class Projects::Ci::LintsController < Projects::ApplicationController
respond_to :json, only: [:create]
urgency :low, [:create]
- def show
- end
+ def show; end
def create
content = params[:content]
diff --git a/app/controllers/projects/ci/pipeline_editor_controller.rb b/app/controllers/projects/ci/pipeline_editor_controller.rb
index 62a5baccc629..cad809b738c3 100644
--- a/app/controllers/projects/ci/pipeline_editor_controller.rb
+++ b/app/controllers/projects/ci/pipeline_editor_controller.rb
@@ -11,8 +11,7 @@ class Projects::Ci::PipelineEditorController < Projects::ApplicationController
urgency :low, [:show]
- def show
- end
+ def show; end
private
diff --git a/app/controllers/projects/confluences_controller.rb b/app/controllers/projects/confluences_controller.rb
index fccbdf0bf915..337b673852db 100644
--- a/app/controllers/projects/confluences_controller.rb
+++ b/app/controllers/projects/confluences_controller.rb
@@ -5,8 +5,7 @@ class Projects::ConfluencesController < Projects::ApplicationController
feature_category :integrations
- def show
- end
+ def show; end
private
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index 15db467cb21e..2f8cfb16e394 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -63,8 +63,7 @@ def create
redirect_to_repository
end
- def edit
- end
+ def edit; end
def update
access_denied! unless deploy_key
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 75759b49117b..2bc434d95145 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -84,15 +84,13 @@ def folder
end
# rubocop: enable CodeReuse/ActiveRecord
- def show
- end
+ def show; end
def new
@environment = project.environments.new
end
- def edit
- end
+ def edit; end
def k8s
render action: :show
diff --git a/app/controllers/projects/feature_flags_controller.rb b/app/controllers/projects/feature_flags_controller.rb
index 1ebe9c98960f..e563c9b6ceae 100644
--- a/app/controllers/projects/feature_flags_controller.rb
+++ b/app/controllers/projects/feature_flags_controller.rb
@@ -30,8 +30,7 @@ def index
end
end
- def new
- end
+ def new; end
def show
respond_to do |format|
@@ -57,8 +56,7 @@ def create
end
end
- def edit
- end
+ def edit; end
def update
result = FeatureFlags::UpdateService.new(project, current_user, update_params).execute(feature_flag)
diff --git a/app/controllers/projects/feature_flags_user_lists_controller.rb b/app/controllers/projects/feature_flags_user_lists_controller.rb
index 023eb51cc94a..0aade90dfbbf 100644
--- a/app/controllers/projects/feature_flags_user_lists_controller.rb
+++ b/app/controllers/projects/feature_flags_user_lists_controller.rb
@@ -7,17 +7,13 @@ class Projects::FeatureFlagsUserListsController < Projects::ApplicationControlle
feature_category :feature_flags
urgency :low
- def index
- end
+ def index; end
- def new
- end
+ def new; end
- def edit
- end
+ def edit; end
- def show
- end
+ def show; end
private
diff --git a/app/controllers/projects/import/jira_controller.rb b/app/controllers/projects/import/jira_controller.rb
index 46c4761b0ea7..712cf5297c38 100644
--- a/app/controllers/projects/import/jira_controller.rb
+++ b/app/controllers/projects/import/jira_controller.rb
@@ -9,8 +9,7 @@ class JiraController < Projects::ApplicationController
feature_category :integrations
- def show
- end
+ def show; end
private
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index 4a87c3775000..bd4d13ac93ae 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -14,8 +14,7 @@ class Projects::ImportsController < Projects::ApplicationController
feature_category :importers
urgency :low
- def new
- end
+ def new; end
def create
@project.import_state.reset.schedule if @project.update(import_params)
diff --git a/app/controllers/projects/incidents_controller.rb b/app/controllers/projects/incidents_controller.rb
index e050c0c76ae8..218b2505a63e 100644
--- a/app/controllers/projects/incidents_controller.rb
+++ b/app/controllers/projects/incidents_controller.rb
@@ -16,8 +16,7 @@ class Projects::IncidentsController < Projects::ApplicationController
feature_category :incident_management
urgency :low
- def index
- end
+ def index; end
private
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb
index 4e62541f4425..8ea33911ec86 100644
--- a/app/controllers/projects/jobs_controller.rb
+++ b/app/controllers/projects/jobs_controller.rb
@@ -178,8 +178,7 @@ def test_report_summary
end
end
- def terminal
- end
+ def terminal; end
# GET .../terminal.ws : implemented in gitlab-workhorse
def terminal_websocket_authorize
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 0d8876a822cb..8d900e91a494 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -52,8 +52,7 @@ def create
end
end
- def edit
- end
+ def edit; end
def update
@label = Labels::UpdateService.new(label_params).execute(@label)
diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb
index 9a3e7e31d682..e058002a95f6 100644
--- a/app/controllers/projects/mattermosts_controller.rb
+++ b/app/controllers/projects/mattermosts_controller.rb
@@ -12,8 +12,7 @@ class Projects::MattermostsController < Projects::ApplicationController
feature_category :integrations
- def new
- end
+ def new; end
def create
result, message = integration.configure(current_user, configure_params)
diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb
index 6aaedfad7f6c..253c3586c576 100644
--- a/app/controllers/projects/pipeline_schedules_controller.rb
+++ b/app/controllers/projects/pipeline_schedules_controller.rb
@@ -19,8 +19,7 @@ def index
@schedules = Ci::PipelineSchedulesFinder.new(@project).execute(scope: params[:scope])
end
- def new
- end
+ def new; end
def create
response = Ci::PipelineSchedules::CreateService.new(@project, current_user, schedule_params).execute
@@ -33,8 +32,7 @@ def create
end
end
- def edit
- end
+ def edit; end
def update
response = Ci::PipelineSchedules::UpdateService.new(schedule, current_user, schedule_params).execute
diff --git a/app/controllers/projects/settings/packages_and_registries_controller.rb b/app/controllers/projects/settings/packages_and_registries_controller.rb
index 4a3235bf9f30..f64239b527fe 100644
--- a/app/controllers/projects/settings/packages_and_registries_controller.rb
+++ b/app/controllers/projects/settings/packages_and_registries_controller.rb
@@ -13,8 +13,7 @@ class PackagesAndRegistriesController < Projects::ApplicationController
feature_category :package_registry
urgency :low
- def show
- end
+ def show; end
def cleanup_tags
registry_settings_enabled!
diff --git a/app/controllers/projects/terraform_controller.rb b/app/controllers/projects/terraform_controller.rb
index ed1783bb43d3..ee8477ca029a 100644
--- a/app/controllers/projects/terraform_controller.rb
+++ b/app/controllers/projects/terraform_controller.rb
@@ -6,8 +6,7 @@ class Projects::TerraformController < Projects::ApplicationController
feature_category :infrastructure_as_code
urgency :low
- def index
- end
+ def index; end
private
diff --git a/app/controllers/pwa_controller.rb b/app/controllers/pwa_controller.rb
index 8de1b10e1f19..e8b265aaea6c 100644
--- a/app/controllers/pwa_controller.rb
+++ b/app/controllers/pwa_controller.rb
@@ -8,9 +8,7 @@ class PwaController < ApplicationController # rubocop:disable Gitlab/NamespacedC
skip_before_action :authenticate_user!
- def manifest
- end
+ def manifest; end
- def offline
- end
+ def offline; end
end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 056e76e9a80d..9e4c69e467be 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -152,8 +152,7 @@ def autocomplete
render json: Gitlab::Json.dump(search_autocomplete_opts(term, filter: @filter, scope: @scope))
end
- def opensearch
- end
+ def opensearch; end
private
--
GitLab