aboutsummaryrefslogtreecommitdiff
path: root/lib/mauve/configuration_builders
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2017-03-20 14:08:34 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2017-03-20 14:11:27 +0000
commitc1ca338fdb32b05fd047730be9ca6569d22c6806 (patch)
tree23eb2052dd9aaf7569d5c030a9b3676b69de947f /lib/mauve/configuration_builders
parentcce9b3743fa1128ffb72b7d2c5f5aa94a52993e9 (diff)
Updated gems to (roughly) jessie versions; removed XMPP support.
Also changed the postgres tests to "skip" if no postgres db is available.
Diffstat (limited to 'lib/mauve/configuration_builders')
-rw-r--r--lib/mauve/configuration_builders/person.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mauve/configuration_builders/person.rb b/lib/mauve/configuration_builders/person.rb
index aac5f69..ccc67aa 100644
--- a/lib/mauve/configuration_builders/person.rb
+++ b/lib/mauve/configuration_builders/person.rb
@@ -23,7 +23,6 @@ module Mauve
is_attribute "password"
is_attribute "sms"
is_attribute "email"
- is_attribute "xmpp"
is_attribute "hipchat"
is_flag_attribute "notify_when_on_holiday"
@@ -109,8 +108,8 @@ module Mauve
# Set up some default notify levels.
#
if person.urgent.nil? and person.normal.nil? and person.low.nil?
- person.urgent = Proc.new { sms ; xmpp ; email }
- person.normal = Proc.new { xmpp ; email }
+ person.urgent = Proc.new { sms ; email }
+ person.normal = Proc.new { email }
person.low = Proc.new { email }
end