[gentoo-commits] proj/glsamaker:master commit in: config/

[Alex Legler]

commit:     7b2c5aa0a22c35bdbddf157a8e05ea09a9b1d480
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Sun Feb 20 12:02:02 2011 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 12:02:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/glsamaker.git;a=commit;h=7b2c5aa0

Update to rails 2.3.11

---
 config/boot.rb        |    8 ++------
 config/environment.rb |    2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/config/boot.rb b/config/boot.rb
index 6686664..dd5e3b6 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -62,12 +62,8 @@ module Rails
         gem 'rails'
       end
     rescue Gem::LoadError => load_error
-      if load_error.message =~ /Could not find RubyGem rails/
-        STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-        exit 1
-      else
-        raise
-      end
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
     end
 
     class << self

diff --git a/config/environment.rb b/config/environment.rb
index 19bd88d..ec1c50f 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')