Skip to content

Commit

Permalink
reverts changes to Rails.version made in rails#8501
Browse files Browse the repository at this point in the history
  • Loading branch information
Charlie Somerville committed Mar 30, 2013
1 parent 022ed6c commit ceb3b87
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
4 changes: 4 additions & 0 deletions railties/lib/rails.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ def groups(*groups)
groups
end

def version
VERSION::STRING
end

def public_path
application && Pathname.new(application.paths["public"].first)
end
Expand Down
13 changes: 6 additions & 7 deletions railties/lib/rails/version.rb
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions version.rb
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit ceb3b87

Please sign in to comment.