1 files changed, 15 insertions, 9 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 7d99f10822d..f1de41674c6 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -28,20 +28,18 @@ class Environment < ApplicationRecord
   has_many :self_managed_prometheus_alert_events, inverse_of: :environment
   has_many :alert_management_alerts, class_name: 'AlertManagement::Alert', inverse_of: :environment
 
-  # NOTE:
-  # 1) no-op arguments is to prevent accidental legacy preloading. See: https://gitlab.com/gitlab-org/gitlab/-/issues/369240
-  # 2) If you preload multiple last deployments of environments, use Preloaders::Environments::DeploymentPreloader.
-  has_one :last_deployment, -> (_env) { success.ordered }, class_name: 'Deployment', inverse_of: :environment
-  has_one :last_visible_deployment, -> (_env) { visible.order(id: :desc) }, inverse_of: :environment, class_name: 'Deployment'
-  has_one :upcoming_deployment, -> (_env) { upcoming.order(id: :desc) }, class_name: 'Deployment', inverse_of: :environment
+  # NOTE: If you preload multiple last deployments of environments, use Preloaders::Environments::DeploymentPreloader.
+  has_one :last_deployment, -> { success.ordered }, class_name: 'Deployment', inverse_of: :environment
+  has_one :last_visible_deployment, -> { visible.order(id: :desc) }, inverse_of: :environment, class_name: 'Deployment'
+  has_one :upcoming_deployment, -> { upcoming.order(id: :desc) }, class_name: 'Deployment', inverse_of: :environment
 
   Deployment::FINISHED_STATUSES.each do |status|
-    has_one :"last_#{status}_deployment", -> (_env) { where(status: status).ordered },
+    has_one :"last_#{status}_deployment", -> { where(status: status).ordered },
             class_name: 'Deployment', inverse_of: :environment
   end
 
   Deployment::UPCOMING_STATUSES.each do |status|
-    has_one :"last_#{status}_deployment", -> (_env) { where(status: status).ordered_as_upcoming },
+    has_one :"last_#{status}_deployment", -> { where(status: status).ordered_as_upcoming },
             class_name: 'Deployment', inverse_of: :environment
   end
 
@@ -74,7 +72,11 @@ class Environment < ApplicationRecord
   # Currently, the tier presence is validaed for newly created environments.
   # After the `BackfillEnvironmentTiers` background migration has been completed, we should remove `on: :create`.
   # See https://gitlab.com/gitlab-org/gitlab/-/issues/385253.
-  validates :tier, presence: true, on: :create
+  # Todo: Remove along with FF `validate_environment_tier_presence`.
+  validates :tier, presence: true, on: :create, unless: :validate_environment_tier_present?
+
+  validates :tier, presence: true, if: :validate_environment_tier_present?
+
   validate :safe_external_url
   validate :merge_request_not_changed
 
@@ -600,6 +602,10 @@ class Environment < ApplicationRecord
       self.class.tiers[:other]
     end
   end
+
+  def validate_environment_tier_present?
+    Feature.enabled?(:validate_environment_tier_presence, self.project)
+  end
 end
 
 Environment.prepend_mod_with('Environment')