diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-20 08:52:48 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-20 08:52:48 +0100 |
| commit | 206c5643aae40b0884d42fdb8caeb3f763936fa9 (patch) | |
| tree | 608f5cc7daab7b58b3d159429c595303e7e1c7d4 /railties/lib | |
| parent | fb1eebac940d0648d1640d20a24f085d901d6f30 (diff) | |
| parent | 20a346170cf3922d16e265487cfb1abcc85383c1 (diff) | |
| download | rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.tar.gz rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.tar.bz2 rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/version.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index bd835fba26..9bb4b2a96d 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -1,8 +1,8 @@ module Rails module VERSION #:nodoc: MAJOR = 2 - MINOR = 2 - TINY = 1 + MINOR = 3 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index d68c425871..347ce6352c 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -1,5 +1,6 @@ require 'rbconfig' require 'digest/md5' +require 'active_support/secure_random' class AppGenerator < Rails::Generator::Base DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], |