Gentoo Archives: gentoo-commits

From: Alex Legler <a3li@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/glsamaker:master commit in: config/
Date: Fri, 25 Feb 2011 19:43:45
Message-Id: 7b2c5aa0a22c35bdbddf157a8e05ea09a9b1d480.a3li@gentoo
1 commit: 7b2c5aa0a22c35bdbddf157a8e05ea09a9b1d480
2 Author: Alex Legler <alex <AT> a3li <DOT> li>
3 AuthorDate: Sun Feb 20 12:02:02 2011 +0000
4 Commit: Alex Legler <a3li <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 20 12:02:02 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/glsamaker.git;a=commit;h=7b2c5aa0
7
8 Update to rails 2.3.11
9
10 ---
11 config/boot.rb | 8 ++------
12 config/environment.rb | 2 +-
13 2 files changed, 3 insertions(+), 7 deletions(-)
14
15 diff --git a/config/boot.rb b/config/boot.rb
16 index 6686664..dd5e3b6 100644
17 --- a/config/boot.rb
18 +++ b/config/boot.rb
19 @@ -62,12 +62,8 @@ module Rails
20 gem 'rails'
21 end
22 rescue Gem::LoadError => load_error
23 - if load_error.message =~ /Could not find RubyGem rails/
24 - 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.)
25 - exit 1
26 - else
27 - raise
28 - end
29 + $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.)
30 + exit 1
31 end
32
33 class << self
34
35 diff --git a/config/environment.rb b/config/environment.rb
36 index 19bd88d..ec1c50f 100644
37 --- a/config/environment.rb
38 +++ b/config/environment.rb
39 @@ -1,7 +1,7 @@
40 # Be sure to restart your server when you modify this file
41
42 # Specifies gem version of Rails to use when vendor/rails is not present
43 -RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
44 +RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
45
46 # Bootstrap the Rails environment, frameworks, and default configuration
47 require File.join(File.dirname(__FILE__), 'boot')