diff options
| author | rick <technoweenie@gmail.com> | 2008-09-20 13:00:20 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-09-20 13:00:20 -0700 |
| commit | 22e830f883af0b56de81186c184751b6398d0141 (patch) | |
| tree | 0de20fad9f3a7ce2e49d660d1243b5b02a32e290 /railties/lib/initializer.rb | |
| parent | 0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2 (diff) | |
| parent | a3b7fa78bfdc33e45e39c095b67e02d50a2c7bea (diff) | |
| download | rails-22e830f883af0b56de81186c184751b6398d0141.tar.gz rails-22e830f883af0b56de81186c184751b6398d0141.tar.bz2 rails-22e830f883af0b56de81186c184751b6398d0141.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/initializer.rb')
| -rw-r--r-- | railties/lib/initializer.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 008f1de8fa..74d2daa34b 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -488,7 +488,7 @@ Run `rake gems:install` to install the missing gems. # If assigned value cannot be matched to a TimeZone, an exception will be raised. def initialize_time_zone if configuration.time_zone - zone_default = Time.send!(:get_zone, configuration.time_zone) + zone_default = Time.__send__(:get_zone, configuration.time_zone) unless zone_default raise %{Value assigned to config.time_zone not recognized. Run "rake -D time" for a list of tasks for finding appropriate time zone names.} end @@ -784,7 +784,6 @@ Run `rake gems:install` to install the missing gems. def threadsafe! self.cache_classes = true self.dependency_loading = false - self.active_record.allow_concurrency = true self.action_controller.allow_concurrency = true self end |