Select recently updated environments for auto-close

app/models/environment.rb

@@ -37,6 +37,10 @@ class Environment < ActiveRecord::Base
     state :stopped
   end
 
+  def recently_updated_on?(ref)
+    ref.to_s == last_deployment.ref
+  end
+
   def last_deployment
     deployments.last
   end

app/models/project.rb

@@ -1299,9 +1299,9 @@ class Project < ActiveRecord::Base
     envs = environments.available.where(id: environment_ids)
 
     if commit
-      envs.select { |env| env.includes_commit?(commit) }
+      envs.select { |environment| env.includes_commit?(commit) }
     else
-      envs.to_a
+      envs.select { |environment| env.recently_updated_on?(ref) }
     end
   end