X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1844a19f486bdd22896521eb02dd77883c2e6162..6d668f6f3a8514d4cbf28984f80944ba149a0461:/config/environment.rb?ds=sidebyside

diff --git a/config/environment.rb b/config/environment.rb
index 83bfbbf2a..f13b2752b 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
@@ -23,6 +23,7 @@ API_VERSION = ENV['OSM_API_VERSION'] || '0.6'
 #   :api_offline - site online but API offline
 #   :database_readonly - database and site in read-only mode
 #   :database_offline - database offline with site in emergency mode
+#   :gpx_offline - gpx storage offline
 #
 OSM_STATUS = :online
 
@@ -41,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"
@@ -49,12 +50,11 @@ Rails::Initializer.run do |config|
   config.gem 'composite_primary_keys', :version => '2.2.2'
   config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
   config.gem 'rmagick', :lib => 'RMagick'
-  # note: this should be changed to 0.3.6 as soon as it's released, as this has fixes for
-  # uploading multipart documents.
-  config.gem 'oauth', :version => '>=0.2.1'
+  config.gem 'oauth', :version => '>= 0.3.6'
   config.gem 'httpclient'
+  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 ]
@@ -66,9 +66,12 @@ Rails::Initializer.run do |config|
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
 
+  # Configure cache
+  config.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
+
   # 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',
@@ -96,4 +99,5 @@ Rails::Initializer.run do |config|
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
+
 end