Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 1 insertions, 6 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index c25ba6f9268..a3213a59bed 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -206,11 +206,6 @@ class Deployment < ApplicationRecord
     end
   end
 
-  def self.distinct_on_environment
-    order('environment_id, deployments.id DESC')
-      .select('DISTINCT ON (environment_id) deployments.*')
-  end
-
   def self.find_successful_deployment!(iid)
     success.find_by!(iid: iid)
   end
@@ -438,7 +433,7 @@ class Deployment < ApplicationRecord
   def tier_in_yaml
     return unless deployable
 
-    deployable.environment_deployment_tier
+    deployable.environment_tier_from_options
   end
 
   private