diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-21 21:23:14 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-21 21:23:14 +0000 |
commit | e20e221c406b9cb068151c0daa0fc6abe7cb37c2 (patch) | |
tree | 52d116b935b3a7ed2e6f6f90abb406ceb0d8461c | |
parent | 149df275dbabfe5c1e7d73291c8dc84269c6b42c (diff) | |
parent | b9f08c78abb5d6c0103a76c9fba65bb43fa31915 (diff) | |
download | gitlab-ce-e20e221c406b9cb068151c0daa0fc6abe7cb37c2.tar.gz |
Merge branch 'zj-fix-time-ago-tooltip-chat-names' into 'master'
Evalute time_ago method instead of printing it

See merge request !7634
-rw-r--r-- | app/views/profiles/chat_names/_chat_name.html.haml | 2 |
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 |