X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/314b734aa59ac762de09daacd08bbb952c94783d..9cff6985ff69c97bac50bad4c5bc055fc493262b:/config/environment.rb diff --git a/config/environment.rb b/config/environment.rb index 4493d07a4..ad18f132e 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -8,7 +8,7 @@ ENV['RAILS_ENV'] ||= 'production' RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION # Set the server URL -SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org' +SERVER_URL = ENV['OSM_SERVER_URL'] || 'contributor_terms.dev.openstreetmap.org' # Set the generator GENERATOR = ENV['OSM_SERVER_GENERATOR'] || 'OpenStreetMap server' @@ -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,8 +52,10 @@ Rails::Initializer.run do |config| config.gem 'rmagick', :lib => 'RMagick' 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 + # 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 ] @@ -70,7 +72,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',