diff options
| author | Charlie Somerville <charlie@charliesomerville.com> | 2013-03-30 14:16:46 +1100 |
|---|---|---|
| committer | Charlie Somerville <charlie@charliesomerville.com> | 2013-03-30 14:16:46 +1100 |
| commit | ceb3b8717beb9818fbfbab429a8aa697591e184a (patch) | |
| tree | 5298a5b1538cd9ce3c18f8f01021d0c37f819c01 | |
| parent | 022ed6c763d91e1bb032150fc7ec5991141f8119 (diff) | |
| download | rails-ceb3b8717beb9818fbfbab429a8aa697591e184a.tar.gz rails-ceb3b8717beb9818fbfbab429a8aa697591e184a.tar.bz2 rails-ceb3b8717beb9818fbfbab429a8aa697591e184a.zip | |
reverts changes to Rails.version made in #8501
| -rw-r--r-- | railties/lib/rails.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 13 | ||||
| -rw-r--r-- | version.rb | 12 |
3 files changed, 16 insertions, 13 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 84f8b82ad5..bb98bbe5bf 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -82,6 +82,10 @@ module Rails groups end + def version + VERSION::STRING + end + def public_path application && Pathname.new(application.paths["public"].first) end diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index d1d02e086d..47c21b112c 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -1,11 +1,10 @@ module Rails - # Returns the version of the currently loaded Rails as a Gem::Version - def self.version - Gem::Version.new "4.0.0.beta1" - end + module VERSION + MAJOR = 4 + MINOR = 0 + TINY = 0 + PRE = "beta1" - module VERSION #:nodoc: - MAJOR, MINOR, TINY, PRE = Rails.version.segments - STRING = Rails.version.to_s + STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end end diff --git a/version.rb b/version.rb index 367d0f6546..47c21b112c 100644 --- a/version.rb +++ b/version.rb @@ -1,10 +1,10 @@ module Rails - def self.version - Gem::Version.new "4.0.0.beta1" - end + module VERSION + MAJOR = 4 + MINOR = 0 + TINY = 0 + PRE = "beta1" - module VERSION #:nodoc: - MAJOR, MINOR, TINY, PRE = Rails.version.segments - STRING = Rails.version.to_s + STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end end |