cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
Shaun McDonald 2010-01-18 00:20:45 +00:00
parent cd2f195650
commit 868210ece7
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/environment.rb
View file

@ -42,7 +42,7 @@ Rails::Initializer.run do |config|
config.frameworks -= [ :active_record ] config.frameworks -= [ :active_record ]
end 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. # They can then be installed with "rake gems:install" on new installations.
# config.gem "bj" # config.gem "bj"
# config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" # 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 'rmagick', :lib => 'RMagick'
config.gem 'oauth', :version => '>= 0.3.6' config.gem 'oauth', :version => '>= 0.3.6'
config.gem 'httpclient' 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. # in vendor/plugins are loaded in alphabetical order.
# :all can be used as a placeholder for all plugins not explicitly named # :all can be used as a placeholder for all plugins not explicitly named
# config.plugins = [ :exception_notification, :ssl_requirement, :all ] # 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. # Your secret key for verifying cookie session data integrity.
# If you change this key, all old sessions will become invalid! # 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. # no regular words or you'll be exposed to dictionary attacks.
config.action_controller.session = { config.action_controller.session = {
:session_key => '_osm_session', :session_key => '_osm_session',