From 1c1c64c05a9e95c0a389f29637b840d2673e049a Mon Sep 17 00:00:00 2001 From: Siddharth Asthana Date: Wed, 23 Feb 2022 14:22:33 +0530 Subject: [PATCH] Resolve Rails/BelongsTo rubocop offenses Changelog: other --- .rubocop_todo.yml | 7 ------- app/models/deployment.rb | 4 ++-- app/models/environment.rb | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0a946b9d627dba..c5175179bb37a7 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -319,13 +319,6 @@ Rails/ApplicationController: - 'spec/controllers/concerns/continue_params_spec.rb' - 'spec/lib/marginalia_spec.rb' -# Offense count: 3 -# Cop supports --auto-correct. -Rails/BelongsTo: - Exclude: - - 'app/models/deployment.rb' - - 'app/models/environment.rb' - # Offense count: 155 # Cop supports --auto-correct. Rails/ContentTag: diff --git a/app/models/deployment.rb b/app/models/deployment.rb index c06c809538a0ae..2f68f586867070 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -14,8 +14,8 @@ class Deployment < ApplicationRecord ARCHIVABLE_OFFSET = 50_000 - belongs_to :project, required: true - belongs_to :environment, required: true + belongs_to :project, optional: false + belongs_to :environment, optional: false belongs_to :cluster, class_name: 'Clusters::Cluster', optional: true belongs_to :user belongs_to :deployable, polymorphic: true, optional: true # rubocop:disable Cop/PolymorphicAssociations diff --git a/app/models/environment.rb b/app/models/environment.rb index 450ed6206d55cc..8ec4d589c356ec 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -12,7 +12,7 @@ class Environment < ApplicationRecord self.reactive_cache_hard_limit = 10.megabytes self.reactive_cache_work_type = :external_dependency - belongs_to :project, required: true + belongs_to :project, optional: false use_fast_destroy :all_deployments nullify_if_blank :external_url -- GitLab