diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG | 2 | ||||
-rw-r--r-- | railties/lib/initializer.rb | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index d374c32d22..153d49af75 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Updated initializer to only load #{RAILS_ENV}.rb once. Added deprecation warning for config.breakpoint_server. [Nicholas Seckar] + * Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [DHH] To use the new debugger, start your server with script/server --debugger and insert a call to 'debugger' diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 11e24c503b..0a6d7a1341 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -201,6 +201,9 @@ module Rails # is typically one of development, testing, or production. def load_environment silence_warnings do + return if @environment_loaded + @environment_loaded = true + config = configuration constants = self.class.constants @@ -449,6 +452,16 @@ module Rails # a sub class would have access to fine grained modification of the loading behavior. See # the implementation of Rails::Plugin::Loader for more details. attr_accessor :plugin_loader + + # Deprecated options: + def breakpoint_server(_ = nil) + $stderr.puts %( + ******************************************************************* + * config.breakpoint_server has been deprecated and has no effect. * + ******************************************************************* + ) + end + alias_method :breakpoint_server=, :breakpoint_server # Create a new Configuration instance, initialized with the default # values. |