aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-07-04 15:18:35 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-07-04 15:18:35 +0100
commit38ea2c6f6e84ac47672cfb1a73fa7bbb599064ae (patch)
treee0499a6e955936d986da7d467e28df462369c621 /lib
parent7955f018ab4dcbc0406dd83d4b62924be68dc072 (diff)
Added byline to acknowledged updates.
Diffstat (limited to 'lib')
-rw-r--r--lib/mauve/notifiers/templates/email.html.erb2
-rw-r--r--lib/mauve/notifiers/templates/email.txt.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mauve/notifiers/templates/email.html.erb b/lib/mauve/notifiers/templates/email.html.erb
index c2016fd..ab65b48 100644
--- a/lib/mauve/notifiers/templates/email.html.erb
+++ b/lib/mauve/notifiers/templates/email.html.erb
@@ -6,7 +6,7 @@ case alert.update_type.to_sym
when :cleared
%><%= alert.cleared_at.to_s_relative %><%
when :acknowledged
-%><%= alert.acknowledged_at.to_s_relative %><%
+%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by%><%
else
%><%= alert.raised_at.to_s_relative %><%
end
diff --git a/lib/mauve/notifiers/templates/email.txt.erb b/lib/mauve/notifiers/templates/email.txt.erb
index dbbd3fa..57b9309 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.to_sym
when :cleared
%><%= alert.cleared_at.to_s_relative %><%
when :acknowledged
-%><%= alert.acknowledged_at.to_s_relative %><%
+%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %><%
else
%><%= alert.raised_at.to_s_relative %><%
end