1 files changed, 14 insertions, 6 deletions
diff --git a/app/helpers/environment_helper.rb b/app/helpers/environment_helper.rb
index 1e2a8c7ddbd..ea34bce9367 100644
--- a/app/helpers/environment_helper.rb
+++ b/app/helpers/environment_helper.rb
@@ -2,20 +2,28 @@ module EnvironmentHelper
   def environment_for_build(project, build)
     return unless build.environment
 
-    environment_name = ExpandVariables.expand(build.environment, build.variables)
-    project.environments.find_by(name: environment_name)
+    project.environments.find_by(name: build.expanded_environment_name)
   end
 
   def environment_link_for_build(project, build)
     environment = environment_for_build(project, build)
-    return unless environment
-
-    link_to environment.name, namespace_project_environment_path(project.namespace, project, environment)
+    if environment
+      link_to environment.name, namespace_project_environment_path(project.namespace, project, environment)
+    else
+      content_tag :span, build.expanded_environment_name
+    end
   end
 
-  def deployment_link(project, deployment)
+  def deployment_link(deployment)
     return unless deployment
 
     link_to "##{deployment.id}", [deployment.project.namespace.becomes(Namespace), deployment.project, deployment.deployable]
   end
+
+  def last_deployment_link_for_environment_build(project, build)
+    environment = environment_for_build(project, build)
+    return unless environment
+
+    deployment_link(environment.last_deployment)
+  end
 end