aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/merges
diff options
context:
space:
mode:
authorZog2018-01-19 16:42:19 +0100
committerZog2018-02-02 14:32:09 +0100
commitbb238237ee32f7bb96fd3add772d778a7e8c8503 (patch)
tree984b76d60569cff5d099d9018053ed0f7bc3b7dd /app/views/merges
parent8dafca888d30a3dea4d710769d9c627ff86f8518 (diff)
downloadchouette-core-bb238237ee32f7bb96fd3add772d778a7e8c8503.tar.bz2
Refs #3542 @2h; Various UI improvements (hopefully)
Diffstat (limited to 'app/views/merges')
-rw-r--r--app/views/merges/show.html.slim3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/merges/show.html.slim b/app/views/merges/show.html.slim
index 47e5aa029..a94552c0d 100644
--- a/app/views/merges/show.html.slim
+++ b/app/views/merges/show.html.slim
@@ -12,3 +12,6 @@
@merge.class.human_attribute_name(:created_at) => @merge.created_at ? l(@merge.created_at) : '-',
@merge.class.human_attribute_name(:started_at) => @merge.started_at ? l(@merge.started_at) : '-',
@merge.class.human_attribute_name(:ended_at) => @merge.ended_at ? l(@merge.ended_at) : '-' }
+
+ - if resource.output.current
+ = referential_overview resource.output.current