Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 12 insertions, 0 deletions

diff --git a/app/serializers/environment_status_entity.rb b/app/serializers/environment_status_entity.rb
index e8cf7980f5e..9318e0c1de8 100644
--- a/app/serializers/environment_status_entity.rb
+++ b/app/serializers/environment_status_entity.rb
@@ -23,6 +23,10 @@ class EnvironmentStatusEntity < Grape::Entity
     stop_project_environment_path(es.project, es.environment)
   end
 
+  expose :retry_url, if: ->(*) { can_rollback_environment? } do |es|
+    retry_project_job_path(es.project, es.deployment.deployable)
+  end
+
   expose :external_url do |es|
     es.environment.external_url
   end
@@ -41,6 +45,10 @@ class EnvironmentStatusEntity < Grape::Entity
     DeploymentEntity.represent(es.deployment, options.merge(project: es.project, only: [:playable_build]))
   end
 
+  expose :environment_available do |es|
+    es.environment.available?
+  end
+
   expose :changes
 
   private
@@ -68,4 +76,8 @@ class EnvironmentStatusEntity < Grape::Entity
   def can_stop_environment?
     can?(current_user, :stop_environment, environment)
   end
+
+  def can_rollback_environment?
+    object.deployable && can?(current_user, :play_job, object.deployable)
+  end
 end