From 28e5d989ea6a36c219ac0472b191a92cec391544 Mon Sep 17 00:00:00 2001
From: Michael Frister <michael+git@frister.net>
Date: Wed, 7 May 2014 09:40:41 +0200
Subject: [PATCH] Update rails to 3.2.18 due to CVE-2014-0130.

---
 Gemfile      |  2 +-
 Gemfile.lock | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Gemfile b/Gemfile
index f7c71c2b6b..d3eb898d00 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,7 +44,7 @@ end
 
 source 'https://rubygems.org'
 
-gem "rails", "~> 3.2.17"
+gem "rails", "~> 3.2.18"
 
 gem "coderay", "~> 1.0.5"
 gem "rubytree", "~> 0.8.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 19f3cfbad9..a00b249875 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,12 +23,12 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.17)
-      actionpack (= 3.2.17)
+    actionmailer (3.2.18)
+      actionpack (= 3.2.18)
       mail (~> 2.5.4)
-    actionpack (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -36,20 +36,20 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-tableless (1.3.3)
       activerecord (>= 2.3.0)
-    activeresource (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-    activesupport (3.2.17)
+    activeresource (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+    activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts_as_list (0.2.0)
@@ -240,22 +240,22 @@ GEM
     rack_session_access (0.1.1)
       builder (>= 2.0.0)
       rack (>= 1.0.0)
-    rails (3.2.17)
-      actionmailer (= 3.2.17)
-      actionpack (= 3.2.17)
-      activerecord (= 3.2.17)
-      activeresource (= 3.2.17)
-      activesupport (= 3.2.17)
+    rails (3.2.18)
+      actionmailer (= 3.2.18)
+      actionpack (= 3.2.18)
+      activerecord (= 3.2.18)
+      activeresource (= 3.2.18)
+      activesupport (= 3.2.18)
       bundler (~> 1.0)
-      railties (= 3.2.17)
+      railties (= 3.2.18)
     rails-dev-tweaks (0.6.1)
       actionpack (~> 3.1)
       railties (~> 3.1)
     rails_autolink (1.1.0)
       rails (> 3.1)
-    railties (3.2.17)
-      actionpack (= 3.2.17)
-      activesupport (= 3.2.17)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -415,7 +415,7 @@ DEPENDENCIES
   rabl (= 0.9.3)
   rack-protection!
   rack_session_access
-  rails (~> 3.2.17)
+  rails (~> 3.2.18)
   rails-dev-tweaks (~> 0.6.1)
   rails_autolink
   rb-fsevent