summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-11-21 21:23:14 +0000
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-12-01 12:39:15 -0300
commit7e828614167d3fd1425e2eb9b94422211f541653 (patch)
treede1f81d8a0ccc092f074c5276c7bb14a0ad45faf
parent8a6bc26600bba01fe6ffaf214a3bca6d464abb4d (diff)
downloadgitlab-ce-7e828614167d3fd1425e2eb9b94422211f541653.tar.gz
Merge branch 'zj-fix-time-ago-tooltip-chat-names' into 'master'
Evalute time_ago method instead of printing it ![Screen_Shot_2016-11-21_at_21.00.34](/uploads/295ffa522865fe1865b0c0b552a49ebf/Screen_Shot_2016-11-21_at_21.00.34.png) See merge request !7634
-rw-r--r--app/views/profiles/chat_names/_chat_name.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/chat_names/_chat_name.html.haml b/app/views/profiles/chat_names/_chat_name.html.haml
index 6b32d377e1a..1ec1e7c70e4 100644
--- a/app/views/profiles/chat_names/_chat_name.html.haml
+++ b/app/views/profiles/chat_names/_chat_name.html.haml
@@ -19,7 +19,7 @@
= chat_name.chat_name
%td
- if chat_name.last_used_at
- time_ago_with_tooltip(chat_name.last_used_at)
+ = time_ago_with_tooltip(chat_name.last_used_at)
- else
Never