diff options
| author | Mark Longair <mhl@pobox.com> | 2013-05-28 14:39:09 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-05-28 14:39:09 +0100 |
| commit | c248356a8e8a13513827381977b24f7406f96a8c (patch) | |
| tree | a0b2210c5956d0da8ea534fe8b772cd776087460 /config/initializers | |
| parent | ed03c3ef55fd61b9be3578ee0c93767d2c218b53 (diff) | |
| parent | 011e55bd4acf4f3c9de91c5ed4c646e855f19c24 (diff) | |
Merge branch 'tmail-to-mail-tests' into rails-3-develop
This merge brings in a number of tests and fixes for the handling
of mail under Mail / Rails 3 instead of TMail / Rails 2.
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/alaveteli.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 4acc126d0..a9e9d498d 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -59,6 +59,8 @@ require 'quiet_opener.rb' require 'mail_handler' require 'public_body_categories' require 'ability' +require 'normalize_string' +require 'alaveteli_file_types' # Allow tests to be run under a non-superuser database account if required if Rails.env == 'test' and ActiveRecord::Base.configurations['test']['constraint_disabling'] == false |