diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-07-12 21:39:36 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-12 21:39:36 +0100 |
| commit | 0cfa3574d599f3bc134cd13fa00d8f22809dd67b (patch) | |
| tree | b8af1a893ba900c9901c9b1fb7a9a2246aba67c6 /railties/lib/tasks | |
| parent | ef67bd481bacd1ff36a79b7f23f3c08f12f6cbe1 (diff) | |
| parent | 99cc85bc099a757cdd44e4f5f1be4972ab124e0d (diff) | |
| download | rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.tar.gz rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.tar.bz2 rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base.rb
railties/lib/rails_generator/commands.rb
Diffstat (limited to 'railties/lib/tasks')
| -rw-r--r-- | railties/lib/tasks/misc.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/tasks/misc.rake b/railties/lib/tasks/misc.rake index 61042595f9..33bbba1101 100644 --- a/railties/lib/tasks/misc.rake +++ b/railties/lib/tasks/misc.rake @@ -44,7 +44,7 @@ namespace :time do end end previous_offset = nil - TimeZone.__send__(method).each do |zone| + ActiveSupport::TimeZone.__send__(method).each do |zone| if offset.nil? || offset == zone.utc_offset puts "\n* UTC #{zone.formatted_offset} *" unless zone.utc_offset == previous_offset puts zone.name |