kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Don't match commented out RAILS_GEM_VERSIONs.

Browse source 
Avoid "Constant already defined" warnings for RAILS_GEM_VERSION.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4196 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Nicholas Seckar 2006-04-07 17:48:47 +00:00
parent 34a7f66825
commit 7d3092478c
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
railties/CHANGELOG
View file

@ -1,3 +1,7 @@
* Don't match commented out RAILS_GEM_VERSIONs. [Nicholas Seckar]
* Avoid "Constant already defined" warnings for RAILS_GEM_VERSION. [Chad Fowler]
*1.1.1* (April 6th, 2005)
* Enhances plugin#discover allowing it to discover svn:// like URIs (closes #4565) [ruben.nine@gmail.com]

2
railties/environments/boot.rb
View file

@ -14,7 +14,7 @@ if File.directory?("#{RAILS_ROOT}/vendor/rails")
else
require 'rubygems'
if !defined?(RAILS_GEM_VERSION) && File.read(File.dirname(__FILE__) + '/environment.rb') =~ /RAILS_GEM_VERSION = '([\d.]+)'/
if !defined?(RAILS_GEM_VERSION) && File.read(File.dirname(__FILE__) + '/environment.rb') =~ /^\s*RAILS_GEM_VERSION = '([\d.]+)'/
RAILS_GEM_VERSION = $1
end

2
railties/environments/environment.rb
View file

@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
<%= '# ' if freeze %>RAILS_GEM_VERSION = '<%= Rails::VERSION::STRING %>'
<%= '# ' if freeze %>RAILS_GEM_VERSION = '<%= Rails::VERSION::STRING %>' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')