Merge branch 'master' into terms

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index c8c874a3c9e8bea9be84a9cad3e3134bae61fa3e..ad18f132e40e21874f8b19f67686b2e37756b2bb 100644 (file)
--- 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'
@@ -54,9 +54,6 @@ Rails::Initializer.run do |config|
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
-  # if Rails.env == "development"
-    config.gem 'timecop'
-  # end
 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.