diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-08 12:53:13 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-08 12:53:13 +0200 |
| commit | c07746cbdfb7b60d2692c9c4a549e4e1b133865f (patch) | |
| tree | 392c6e0e368a94e65735e9f3bcf861566132c9fa /railties/lib/initializer.rb | |
| parent | dd7ee082be9e53bbee15144b4c03b42a269b154b (diff) | |
| parent | 579250ea467ac406a5897dc2187c7959bf343b4f (diff) | |
| download | rails-c07746cbdfb7b60d2692c9c4a549e4e1b133865f.tar.gz rails-c07746cbdfb7b60d2692c9c4a549e4e1b133865f.tar.bz2 rails-c07746cbdfb7b60d2692c9c4a549e4e1b133865f.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 560105670f..f0fb78c8f4 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -12,6 +12,10 @@ require 'rails/configuration' RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV) module Rails + # Sanity check to make sure this file is only loaded once + # TODO: Get to the point where this can be removed. + raise "It looks like initializer.rb was required twice" if defined?(Initializer) + class Initializer class Error < StandardError ; end |