Merge branch 'master' into openstreetbugs

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 1ad6aa202bab2a1bb4798ec3efb809cefe0fc97b..98fdfaa8c2b3709eb2271a7cc3745a2c3c0665a5 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -53,6 +53,7 @@ Rails::Initializer.run do |config|
   config.gem 'oauth', :version => '>= 0.3.6'
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
+  config.gem 'sanitize'
 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.
@@ -100,6 +101,4 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
 
-  Mime::Type.register "text/xml", :gpx
-
 end