From: Xin Zheng <xin@zenpow.com>
Date: Tue, 22 Jan 2008 16:50:14 +0000 (+0000)
Subject: extracted require statement from environment.rb to intializers/requires.rb
X-Git-Tag: live~7977
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/726836f31e132bbcefce5fb398485ceafbb12db3?hp=1c6ac719e62145e16ee3fc09d728662f9a04524d;ds=sidebyside

extracted require statement from environment.rb to intializers/requires.rb
---

diff --git a/config/environment.rb b/config/environment.rb
index 436d5961d..abdb8bdfa 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.0.1' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
@@ -67,6 +67,3 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 end
-
-
-require 'composite_primary_keys'
diff --git a/config/initializers/requires.rb b/config/initializers/requires.rb
new file mode 100644
index 000000000..8fc935778
--- /dev/null
+++ b/config/initializers/requires.rb
@@ -0,0 +1 @@
+require 'composite_primary_keys'