From 16b47aa1105c965f7cfbb8422b3bae2d4bfc9864 Mon Sep 17 00:00:00 2001
From: Joachim Filip Ignacy Bartosik <jbartosik@gmail.com>
Date: Mon, 27 Dec 2010 22:32:16 +0100
Subject: Update to rails 2.3.8 & rack 1.1.0

This is what Gentoo Infra uses.
---
 Gemfile               |  4 +++-
 Gemfile.lock          | 55 +++++++++++++++++++++++++++++----------------------
 config/environment.rb |  2 +-
 3 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7206000..a49ba07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 source :gemcutter
 
-gem 'rails', '2.3.5'
+gem 'rails', '2.3.8'
+gem 'rack', '1.1.0'
 gem 'mail'
 gem 'gpgme'
 gem 'hobo'
@@ -16,6 +17,7 @@ group :test do
   gem 'email_spec', '0.6.2'
   gem 'shoulda'
   gem 'factory_girl'
+  gem 'launchy'
 end
 
 group :cucumber do
diff --git a/Gemfile.lock b/Gemfile.lock
index af14938..2aef1c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,19 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.5)
-      actionpack (= 2.3.5)
-    actionpack (2.3.5)
-      activesupport (= 2.3.5)
-      rack (~> 1.0.0)
-    activerecord (2.3.5)
-      activesupport (= 2.3.5)
-    activeresource (2.3.5)
-      activesupport (= 2.3.5)
-    activesupport (2.3.5)
+    actionmailer (2.3.8)
+      actionpack (= 2.3.8)
+    actionpack (2.3.8)
+      activesupport (= 2.3.8)
+      rack (~> 1.1.0)
+    activerecord (2.3.8)
+      activesupport (= 2.3.8)
+    activeresource (2.3.8)
+      activesupport (= 2.3.8)
+    activesupport (2.3.8)
     bluecloth (2.0.9)
     builder (3.0.0)
     columnize (0.3.2)
+    configuration (1.2.0)
     cucumber (0.10.0)
       builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
@@ -29,9 +30,8 @@ GEM
     diff-lcs (1.1.2)
     email_spec (0.6.2)
     factory_girl (1.3.2)
-    gherkin (2.3.2)
+    gherkin (2.3.3)
       json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
     gpgme (1.0.8)
     hobo (1.0.2)
       hobofields (= 1.0.2)
@@ -46,25 +46,30 @@ GEM
       hobosupport (= 1.0.2)
       rails (>= 2.2.2, < 3.0.0)
     hobosupport (1.0.2)
+    i18n (0.5.0)
     json (1.4.6)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
     linecache (0.43)
-    mail (2.2.1)
-      activesupport (>= 2.3.4)
-      mime-types
-      treetop (>= 1.4.5)
+    mail (2.2.13)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
     mysql (2.8.1)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack (1.0.1)
+    rack (1.1.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (2.3.5)
-      actionmailer (= 2.3.5)
-      actionpack (= 2.3.5)
-      activerecord (= 2.3.5)
-      activeresource (= 2.3.5)
-      activesupport (= 2.3.5)
+    rails (2.3.8)
+      actionmailer (= 2.3.8)
+      actionpack (= 2.3.8)
+      activerecord (= 2.3.8)
+      activeresource (= 2.3.8)
+      activesupport (= 2.3.8)
       rake (>= 0.8.3)
     rake (0.8.7)
     rspec (1.3.1)
@@ -99,10 +104,12 @@ DEPENDENCIES
   gpgme
   hobo
   hobo_openid (>= 0.4.2)
+  launchy
   mail
   mysql
   nokogiri
-  rails (= 2.3.5)
+  rack (= 1.1.0)
+  rails (= 2.3.8)
   rspec (= 1.3.1)
   rspec-rails (= 1.3.3)
   ruby-debug
diff --git a/config/environment.rb b/config/environment.rb
index 503860c..5fc656d 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 
-- 
cgit v1.2.3-65-gdbad