diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-03 09:22:41 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-03 09:22:41 +0000 |
| commit | 7414ed478f212be2b48c95fafde15726b348b197 (patch) | |
| tree | 1d89b90f604b837b097fb4274775c4f3b3a319d6 /config/application.rb | |
| parent | 479c9cd4567e2042d00c347f25a411373a6b1df9 (diff) | |
| parent | d05082c1cf1ddec789e547b54943f6e7d5bdffc1 (diff) | |
Merge branch 'release/0.20'0.20.0.0
Conflicts:
config/general.yml-example
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index fc8e0059e..ed4f07819 100644 --- a/config/application.rb +++ b/config/application.rb @@ -61,7 +61,6 @@ module Alaveteli config.action_dispatch.rack_cache = nil config.after_initialize do |app| - require 'routing_filters.rb' # Add a catch-all route to force routing errors to be handled by the application, # rather than by middleware. app.routes.append{ match '*path', :to => 'general#not_found' } @@ -69,6 +68,7 @@ module Alaveteli config.autoload_paths << "#{Rails.root.to_s}/lib/mail_handler" config.autoload_paths << "#{Rails.root.to_s}/lib/attachment_to_html" + config.autoload_paths << "#{Rails.root.to_s}/lib/health_checks" # See Rails::Configuration for more options ENV['RECAPTCHA_PUBLIC_KEY'] = ::AlaveteliConfiguration::recaptcha_public_key |