From ceb3b8717beb9818fbfbab429a8aa697591e184a Mon Sep 17 00:00:00 2001
From: Charlie Somerville <charlie@charliesomerville.com>
Date: Sat, 30 Mar 2013 14:16:46 +1100
Subject: reverts changes to Rails.version made in #8501

---
 railties/lib/rails.rb         |  4 ++++
 railties/lib/rails/version.rb | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'railties')

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
-- 
cgit v1.2.3