Merge branch '25153-ci_environment_status-endpoint-could-return-a-wrong-deployment' into 'master'

Resolve "`ci_environment_status` return correct deployment"

See merge request gitlab-org/gitlab!83199

app/models/environment_status.rb

@@ -51,7 +51,7 @@ class EnvironmentStatus
 
   def deployment
     strong_memoize(:deployment) do
-      Deployment.where(environment: environment).find_by_sha(sha)
+      Deployment.where(environment: environment).ordered.find_by_sha(sha)
     end
   end
 

spec/models/environment_status_spec.rb

@@ -34,6 +34,13 @@ RSpec.describe EnvironmentStatus do
     subject { environment_status.deployment }
 
     it { is_expected.to eq(deployment) }
+
+    context 'multiple deployments' do
+      it {
+        new_deployment = create(:deployment, :succeed, environment: deployment.environment, sha: deployment.sha )
+        is_expected.to eq(new_deployment)
+      }
+    end
   end
 
   # $ git diff --stat pages-deploy-target...pages-deploy