Expose `last_deployment` on `Ci::Builds` [ci skip]

1 files changed, 18 insertions, 16 deletions

diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 6741be25ace..18a336c3fa3 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -26,28 +26,30 @@
             = link_to namespace_project_runners_path(@build.project.namespace, @build.project) do
               Runners page
 
-    - if @build.deploy
+    - if @build.deployable?
       .prepend-top-default
         .environment-information
           = ci_icon_for_status(@build.status)
 
-          - if @build.last_deployment
-            This build is the most recent deployment to
-            = link_to @build.environment, namespace_project_environment_path(@project.namespace, @project, @build.environment)
-          - else
-            - case @build.status
-            - when 'failed', 'canceled'
+          - last_deployment = @build.last_deployment
+          - if @build.complete?
+            - if @build.success?
+              - if last_deployment.try(:last?)
+                This build is the most recent deployment to
+                = environment_link_for_build(@build.project, @build)
+              - else
+                This build is an out-of-date deployment to
+                = environment_link_for_build(@build.project, @build)
+                View the most recent deployment
+                = deployment_link(@project, last_deployment)
+            - else
               The deployment of this build to
-              = link_to @build.environment, namespace_project_environment_path(@project.namespace, @project, @build.environment)
+              = environment_link_for_build(@build.project, @build)
               did not complete
-            - when 'pending', 'running'
-              This build is creating a deployment to
-              = link_to @build.environment, namespace_project_environment_path(@project.namespace, @project, @build.environment)
-              and will overwrite the latest deployment
-            - when 'success'
-              This build is an out-of-date deployment to
-              = link_to @build.environment, namespace_project_environment_path(@project.namespace, @project, @build.environment)
-              View the most recent deployment #24869
+          - else
+            This build is creating a deployment to
+            = environment_link_for_build(@build.project, @build)
+            and will overwrite the latest deployment
 
     .prepend-top-default
       - if @build.erased?