diff options
author | José Valim <jose.valim@gmail.com> | 2009-07-02 10:25:18 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-07-02 10:25:18 +0200 |
commit | 1c265da1db934ffab0a5151dc7beeed3ef1bbabb (patch) | |
tree | e3e2af724e0fe70b9bceb09a26a179fadf76b992 /railties/lib/rails | |
parent | 4739f0ff5d5c013eb33aed7f371a3a91d3fca292 (diff) | |
parent | 8bb510f6c1e235f5fb1cf9e79af759a429a497b0 (diff) | |
download | rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.gz rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.bz2 rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/configuration.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/paths.rb | 4 | ||||
-rw-r--r-- | railties/lib/rails/version.rb | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 59132efe98..d877915460 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -76,7 +76,7 @@ module Rails @paths.config.locales = "config/locales" @paths.config.environments = "config/environments" - @paths.app.controllers.push *builtin_directories + @paths.app.controllers.concat builtin_directories @paths.app.load_path! @paths.app.metals.load_path! diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb index aada7d4a56..d2f6d83659 100644 --- a/railties/lib/rails/paths.rb +++ b/railties/lib/rails/paths.rb @@ -80,6 +80,10 @@ module Rails @paths.unshift path end + def concat(paths) + @paths.concat paths + end + def load_once! @load_once = true @root.load_once.push *self.paths diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 99c7516a65..9a65096061 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 = 3 - TINY = 2 + MAJOR = 3 + MINOR = 0 + TINY = "pre" STRING = [MAJOR, MINOR, TINY].join('.') end |