aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/app_base.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-23 18:51:16 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-23 18:51:16 -0700
commite600384515dc06db2c56ff5be5c18779f7b379a5 (patch)
treefc9938962c6872f06d7afbb765eca41302829636 /railties/lib/rails/generators/app_base.rb
parente96fa8987b0a2c21604c0b5aeb78bedfac5e1faa (diff)
parent8f05fee1ff26247d6fec8f06f711a60a3c4e48fc (diff)
downloadrails-e600384515dc06db2c56ff5be5c18779f7b379a5.tar.gz
rails-e600384515dc06db2c56ff5be5c18779f7b379a5.tar.bz2
rails-e600384515dc06db2c56ff5be5c18779f7b379a5.zip
Merge pull request #8501 from charliesome/version-to-s
Add #to_s method to VERSION modules
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r--railties/lib/rails/generators/app_base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 4e703151ba..e312afa091 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -1,7 +1,7 @@
require 'digest/md5'
require 'securerandom'
require 'active_support/core_ext/string/strip'
-require 'rails/version' unless defined?(Rails::VERSION)
+require 'rails/version' unless defined?(Rails.version)
require 'rbconfig'
require 'open-uri'
require 'uri'
@@ -142,7 +142,7 @@ module Rails
else
<<-GEMFILE.strip_heredoc
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
- gem 'rails', '#{Rails::VERSION::STRING}'
+ gem 'rails', '#{Rails.version}'
GEMFILE
end
end