summaryrefslogtreecommitdiff
path: root/app/views/projects/environments
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-08-05 14:08:39 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-08-08 11:03:18 -0500
commit415921a7f38a19bc907ce0b3db21e4e66e9b1ac2 (patch)
treeff627d6176807031be30fbe27af78a7ea22f326d /app/views/projects/environments
parentace19ec58f39faa084e6f5372732e3c094011c8e (diff)
downloadgitlab-ce-415921a7f38a19bc907ce0b3db21e4e66e9b1ac2.tar.gz
Add avatar to commit message; environment style updates to match pipelines page
Diffstat (limited to 'app/views/projects/environments')
-rw-r--r--app/views/projects/environments/_environment.html.haml7
-rw-r--r--app/views/projects/environments/index.html.haml4
2 files changed, 6 insertions, 5 deletions
diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml
index e2453395602..d04967fa72f 100644
--- a/app/views/projects/environments/_environment.html.haml
+++ b/app/views/projects/environments/_environment.html.haml
@@ -2,8 +2,7 @@
%tr.environment
%td
- %strong
- = link_to environment.name, namespace_project_environment_path(@project.namespace, @project, environment)
+ = link_to environment.name, namespace_project_environment_path(@project.namespace, @project, environment)
%td
- if last_deployment
@@ -14,7 +13,9 @@
%td
- if last_deployment
- #{time_ago_with_tooltip(last_deployment.created_at)}
+ %p.finished-at
+ = icon("calendar")
+ #{time_ago_with_tooltip(last_deployment.created_at, short_format: true, skip_js: true)}
%td
= render 'projects/deployments/actions', deployment: last_deployment
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index a6dd34653ab..fe8ddb4716e 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -23,10 +23,10 @@
New environment
- else
.table-holder
- %table.table.environments
+ %table.table.builds.environments
%tbody
%th Environment
%th Last deployment
- %th Date
+ %th
%th
= render @environments