summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-01 15:38:44 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-08 16:50:03 -0600
commit52c06647b58a8c78c29a79a5647962c065d9ef86 (patch)
treee2571d475a1df1cf572a666ffedf853071ffddf5
parenta0d5bb0bb84d15efaedb78025bd480758b2a4246 (diff)
downloadgitlab-ce-52c06647b58a8c78c29a79a5647962c065d9ef86.tar.gz
Start adding environment info
-rw-r--r--app/assets/stylesheets/pages/builds.scss7
-rw-r--r--app/views/projects/builds/show.html.haml7
2 files changed, 14 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index f1d311cabbe..ebbec89c58c 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -40,6 +40,13 @@
margin-bottom: 10px;
}
}
+
+ .environment-information {
+ background-color: $background-color;
+ border: 1px solid $border-color;
+ padding: 12px $gl-padding;
+ border-radius: $border-radius-default;
+ }
}
.build-header {
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index ae7a7ecb392..4614d0af906 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -26,6 +26,13 @@
= link_to namespace_project_runners_path(@build.project.namespace, @build.project) do
Runners page
+ - if @build.stage == 'deploy'
+ .prepend-top-default
+ .environment-information
+ = ci_icon_for_status(@build.status)
+ This build is the most recent deployment to
+ = link_to @build.environment, namespace_project_environment_path(@project.namespace, @project, @build.environment)
+
.prepend-top-default
- if @build.erased?
.erased.alert.alert-warning