diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-17 13:33:53 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-17 13:31:37 -0700 |
| commit | 9ed7171a6a8c98858949891b298789a97c4f3fba (patch) | |
| tree | 31bab0f4222f98d365860c1ed4104bbcbcf58adc /app | |
| parent | 43906336ff24e218cb1f7024d63a22367dd7e09a (diff) | |
| download | gitlab-ce-9ed7171a6a8c98858949891b298789a97c4f3fba.tar.gz | |
Fix builds/show spec; use iid instead of id23205-information-about-environments-build-page
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/environment_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/environment_helper.rb b/app/helpers/environment_helper.rb index ea34bce9367..27975b7ddb7 100644 --- a/app/helpers/environment_helper.rb +++ b/app/helpers/environment_helper.rb @@ -17,7 +17,7 @@ module EnvironmentHelper def deployment_link(deployment) return unless deployment - link_to "##{deployment.id}", [deployment.project.namespace.becomes(Namespace), deployment.project, deployment.deployable] + link_to "##{deployment.iid}", [deployment.project.namespace.becomes(Namespace), deployment.project, deployment.deployable] end def last_deployment_link_for_environment_build(project, build) diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index efb130a5dd8..0eaa602dc71 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -43,7 +43,7 @@ - if environment.last_deployment View the most recent deployment #{deployment_link(environment.last_deployment)}. - elsif @build.complete? && !@build.success? - The deployment of this build to #{environment_link_for_build(@build.project, @build)} did not complete. + The deployment of this build to #{environment_link_for_build(@build.project, @build)} did not succeed. - else This build is creating a deployment to #{environment_link_for_build(@build.project, @build)} - if environment.last_deployment |