From 645c47d975e3c34a092acddf4a5f9420010755bc Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Wed, 20 Jul 2011 16:15:03 +0100 Subject: * Added heartbeat to remote mauve * Added URLs to messages * Added example configuration file * Added various docs * XMPP messages now XHTML and TXT * Handling of MUC reconnection a bit better. --- lib/mauve/notifiers/templates/email.txt.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/mauve/notifiers/templates/email.txt.erb') diff --git a/lib/mauve/notifiers/templates/email.txt.erb b/lib/mauve/notifiers/templates/email.txt.erb index dc5762b..aab44a8 100644 --- a/lib/mauve/notifiers/templates/email.txt.erb +++ b/lib/mauve/notifiers/templates/email.txt.erb @@ -3,7 +3,7 @@ case alert.update_type when "cleared" %><%= alert.cleared_at.to_s_relative %><% when "acknowledged" -%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %><% +%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %> until <%= alert.will_unacknowledge_at.to_s_human %><% else %><%= alert.raised_at.to_s_relative %><% end -- cgit v1.2.1