From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Mon, 18 Jan 2010 00:20:45 +0000 (+0000)
Subject: Use the latest version of SystemTimer. Also gets rid of the warning: 'cleanup_timer... 
X-Git-Tag: live~6891^2~7
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/868210ece76a4a78e4b4e429d9f2f03a7b797f8d

Use the latest version of SystemTimer. Also gets rid of the warning: 'cleanup_timer: Previous SIG_ALRM handler not initialized\!\:' when running the tests due to using the older version of this gem.
---

diff --git a/config/environment.rb b/config/environment.rb
index 727ab2d46..b040c5a46 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -42,7 +42,7 @@ Rails::Initializer.run do |config|
     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"
@@ -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 'system_timer'
+  config.gem 'SystemTimer', :lib => 'system_timer', :source => "http://gemcutter.org/"
 
-  # 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 ]
@@ -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!
-  # 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',