diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-16 11:20:28 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-16 11:20:28 +0000 |
| commit | fc123d189c7394374af91a51efdcc756d3b11185 (patch) | |
| tree | d0bc7c4760197a4abdea3b3f008a1615436acf54 /railties/lib | |
| parent | 6c688d000f7dc8a4e65d6730c7c425839d2583b4 (diff) | |
| parent | 4185a4a5f5e53b55c9ba3757a837d33fb91f4091 (diff) | |
| download | rails-fc123d189c7394374af91a51efdcc756d3b11185.tar.gz rails-fc123d189c7394374af91a51efdcc756d3b11185.tar.bz2 rails-fc123d189c7394374af91a51efdcc756d3b11185.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/rack/metal.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/rack/metal.rb b/railties/lib/rails/rack/metal.rb index 78b8a01449..adc43da864 100644 --- a/railties/lib/rails/rack/metal.rb +++ b/railties/lib/rails/rack/metal.rb @@ -18,7 +18,7 @@ module Rails metal_glob.each do |glob| Dir[glob].sort.map do |file| file = file.match(matcher)[1] - all_metals[file.classify] = file + all_metals[file.camelize] = file end end diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index fd38705e75..99c7516a65 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 1 + TINY = 2 STRING = [MAJOR, MINOR, TINY].join('.') end |