diff --git a/.rubocop_todo/rails/http_status.yml b/.rubocop_todo/rails/http_status.yml deleted file mode 100644 index b1f64f7aa183c41d7d87d1588e7bc177b62daa75..0000000000000000000000000000000000000000 --- a/.rubocop_todo/rails/http_status.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# Cop supports --autocorrect. -Rails/HttpStatus: - Exclude: - - 'app/controllers/concerns/invisible_captcha_on_signup.rb' - - 'app/controllers/projects/runner_projects_controller.rb' - - 'app/controllers/projects/service_ping_controller.rb' - - 'app/controllers/repositories/lfs_storage_controller.rb' - - 'ee/app/controllers/trials_controller.rb' diff --git a/app/controllers/concerns/invisible_captcha_on_signup.rb b/app/controllers/concerns/invisible_captcha_on_signup.rb index c7fd6d08744d25a9dc4ec50302492e78da3482e2..b78869e02d029a008408a34894da56b5597f6287 100644 --- a/app/controllers/concerns/invisible_captcha_on_signup.rb +++ b/app/controllers/concerns/invisible_captcha_on_signup.rb @@ -13,7 +13,7 @@ def on_honeypot_spam_callback invisible_captcha_honeypot_counter.increment log_request('Invisible_Captcha_Honeypot_Request') - head(200) + head(:ok) end def on_timestamp_spam_callback diff --git a/app/controllers/projects/runner_projects_controller.rb b/app/controllers/projects/runner_projects_controller.rb index 5946c43b134d67198417098f4725868d2a451c4c..6f896244acb9020c86b39c6ab9d9b7f3849a29b8 100644 --- a/app/controllers/projects/runner_projects_controller.rb +++ b/app/controllers/projects/runner_projects_controller.rb @@ -11,7 +11,7 @@ class Projects::RunnerProjectsController < Projects::ApplicationController def create @runner = Ci::Runner.find(params[:runner_project][:runner_id]) - return head(403) unless can?(current_user, :assign_runner, @runner) + return head(:forbidden) unless can?(current_user, :assign_runner, @runner) path = project_runners_path(project) diff --git a/app/controllers/projects/service_ping_controller.rb b/app/controllers/projects/service_ping_controller.rb index 43c249afd8e7cdd1614e3ecc95d58e81aa34bc44..cfc322b47e796035901a39aa79ccf22fb843e5e1 100644 --- a/app/controllers/projects/service_ping_controller.rb +++ b/app/controllers/projects/service_ping_controller.rb @@ -10,7 +10,7 @@ def web_ide_clientside_preview Gitlab::UsageDataCounters::WebIdeCounter.increment_previews_count - head(200) + head(:ok) end def web_ide_clientside_preview_success @@ -20,12 +20,12 @@ def web_ide_clientside_preview_success Gitlab::UsageDataCounters::EditorUniqueCounter.track_live_preview_edit_action(author: current_user, project: project) - head(200) + head(:ok) end def web_ide_pipelines_count Gitlab::UsageDataCounters::WebIdeCounter.increment_pipelines_count - head(200) + head(:ok) end end diff --git a/app/controllers/repositories/lfs_storage_controller.rb b/app/controllers/repositories/lfs_storage_controller.rb index d54b51b463af415322f251f4c3f522241369a8ab..22f1a81b95b273299d7d955082ae3c07c0388021 100644 --- a/app/controllers/repositories/lfs_storage_controller.rb +++ b/app/controllers/repositories/lfs_storage_controller.rb @@ -49,7 +49,7 @@ def upload_finalize validate_uploaded_file! if store_file!(oid, size) - head 200, content_type: LfsRequest::CONTENT_TYPE + head :ok, content_type: LfsRequest::CONTENT_TYPE else render plain: 'Unprocessable entity', status: :unprocessable_entity end diff --git a/ee/app/controllers/trials_controller.rb b/ee/app/controllers/trials_controller.rb index 46770eb524ae86fd5a65f40a0f3509535b6d2eea..90e15cd0e3e375188e928008e4b5f885cf4e1db0 100644 --- a/ee/app/controllers/trials_controller.rb +++ b/ee/app/controllers/trials_controller.rb @@ -48,7 +48,7 @@ def create_hand_raise_lead result = GitlabSubscriptions::CreateHandRaiseLeadService.new.execute(hand_raise_lead_params) if result.success? - head 200 + head :ok else render_403 end @@ -64,7 +64,7 @@ def extend_reactivate result = GitlabSubscriptions::ExtendReactivateTrialService.new.execute(extend_reactivate_trial_params) if valid_extension? if result&.success? - head 200 + head :ok else render_403 end