Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 12 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 9bcc6fd90b2..0bfe6172154 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -240,18 +240,10 @@ class Deployment < ApplicationRecord
   def previous_deployment
     @previous_deployment ||=
       self.class.for_environment(environment_id)
-      .where(ref: ref)
-      .where.not(id: id)
-      .order(id: :desc)
-      .take
-  end
-
-  def previous_environment_deployment
-    self.class.for_environment(environment_id)
-      .success
-      .where.not(id: self.id)
-      .order(id: :desc)
-      .take
+        .success
+        .where('id < ?', id)
+        .order(id: :desc)
+        .take
   end
 
   def stop_action