Fixup some error handling in map bugs

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 727ab2d46cb2d9ef28c3c87f84b2cfdc3ab12a2a..f13b2752b5e2c5fd8bb9bc42f3294739ca9a01ab 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -42,7 +42,7 @@ Rails::Initializer.run do |config|
     config.frameworks -= [ :active_record ]
   end
 
     config.frameworks -= [ :active_record ]
   end
 

-  # Specify gems that this application depends on. 
+  # Specify gems that this application depends on.

   # They can then be installed with "rake gems:install" on new installations.
   # config.gem "bj"
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # They can then be installed with "rake gems:install" on new installations.
   # config.gem "bj"
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"


@@ -52,9 +52,9 @@ Rails::Initializer.run do |config|
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'oauth', :version => '>= 0.3.6'
   config.gem 'httpclient'
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'oauth', :version => '>= 0.3.6'
   config.gem 'httpclient'

-  config.gem 'system_timer'
+  config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'

 
 

-  # Only load the plugins named here, in the order given. By default, all plugins 
+  # Only load the plugins named here, in the order given. By default, all plugins

   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]


@@ -71,7 +71,7 @@ Rails::Initializer.run do |config|
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!

-  # Make sure the secret is at least 30 characters and all random, 
+  # Make sure the secret is at least 30 characters and all random,

   # no regular words or you'll be exposed to dictionary attacks.
   config.action_controller.session = {
     :session_key => '_osm_session',
   # no regular words or you'll be exposed to dictionary attacks.
   config.action_controller.session = {
     :session_key => '_osm_session',


@@ -99,4 +99,5 @@ Rails::Initializer.run do |config|
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc

+

 end
 end