diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-11-17 01:39:19 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-11-17 01:39:19 +0000 |
| commit | bff217272dbdb17f366f9986496ef04e2599d2c2 (patch) | |
| tree | df1876d425e24db884e2710228a89abe00f20000 /railties/environments/boot.rb | |
| parent | 4249ffe2498e9a77242205f95245ba1fcca92732 (diff) | |
| download | rails-bff217272dbdb17f366f9986496ef04e2599d2c2.tar.gz rails-bff217272dbdb17f366f9986496ef04e2599d2c2.tar.bz2 rails-bff217272dbdb17f366f9986496ef04e2599d2c2.zip | |
RAILS_GEM_VERSION may be set to any valid gem version specifier. Closes #10057.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/environments/boot.rb')
| -rw-r--r-- | railties/environments/boot.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb index 518a8883c1..b71c198db3 100644 --- a/railties/environments/boot.rb +++ b/railties/environments/boot.rb @@ -55,7 +55,7 @@ module Rails def load_rails_gem if version = self.class.gem_version - gem 'rails', "=#{version}" + gem 'rails', version else gem 'rails' end @@ -93,7 +93,7 @@ module Rails end def parse_gem_version(text) - $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*'([\d.]+)'/ + $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/ end private |