Update Rails

ambethia · Feb 10, 2009 · 4b4c071 · 4b4c071
1 parent daa8a25
commit 4b4c071
Show file tree

Hide file tree

Showing 6 changed files with 775 additions and 671 deletions.
diff --git a/config/boot.rb b/config/boot.rb
@@ -67,7 +67,7 @@ def load_rails_gem
 
     class << self
       def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+        Gem::RubyGemsVersion rescue nil
       end
 
       def gem_version
@@ -82,7 +82,7 @@ def gem_version
 
       def load_rubygems
         require 'rubygems'
-        min_version = '1.1.1'
+        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1

diff --git a/config/environment.rb b/config/environment.rb
@@ -10,7 +10,7 @@
 end
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.1.1' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')