From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pt3Zp-0003dU-Fg for garchives@archives.gentoo.org; Fri, 25 Feb 2011 19:43:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60851E05E8; Fri, 25 Feb 2011 19:43:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3269DE05E8 for ; Fri, 25 Feb 2011 19:43:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF3581B403B for ; Fri, 25 Feb 2011 19:43:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2177A8006A for ; Fri, 25 Feb 2011 19:43:37 +0000 (UTC) From: "Alex Legler" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alex Legler" Message-ID: <7b2c5aa0a22c35bdbddf157a8e05ea09a9b1d480.a3li@gentoo> Subject: [gentoo-commits] proj/glsamaker:master commit in: config/ X-VCS-Repository: proj/glsamaker X-VCS-Files: config/boot.rb config/environment.rb X-VCS-Directories: config/ X-VCS-Committer: a3li X-VCS-Committer-Name: Alex Legler X-VCS-Revision: 7b2c5aa0a22c35bdbddf157a8e05ea09a9b1d480 Date: Fri, 25 Feb 2011 19:43:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: eb72f197be2b7a692f591ffd5e8d12d8 commit: 7b2c5aa0a22c35bdbddf157a8e05ea09a9b1d480 Author: Alex Legler a3li li> AuthorDate: Sun Feb 20 12:02:02 2011 +0000 Commit: Alex Legler gentoo org> CommitDate: Sun Feb 20 12:02:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/glsamaker.git= ;a=3Dcommit;h=3D7b2c5aa0 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 =3D> load_error - if load_error.message =3D~ /Could not find RubyGem rails/ - STDERR.puts %(Missing the Rails #{version} gem. Please `gem inst= all -v=3D#{version} rails`, update your RAILS_GEM_VERSION setting in conf= ig/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 insta= ll -v=3D#{version} rails`, update your RAILS_GEM_VERSION setting in confi= g/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 =20 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 =20 # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION =3D '2.3.8' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION =3D '2.3.11' unless defined? RAILS_GEM_VERSION =20 # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot')