From 118e94221c7898135413d4326ea3a308a05ad722 Mon Sep 17 00:00:00 2001
From: Dan Rice <dan@zoombody.com>
Date: Wed, 2 Jul 2014 17:01:43 -0400
Subject: [PATCH] Update Rails to 4.1.4

---
 Gemfile      |  2 +-
 Gemfile.lock | 52 ++++++++++++++++++++++++++--------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Gemfile b/Gemfile
index c061d70e..020c011b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~>4.1.3'
+gem 'rails', '~>4.1.4'
 gem 'sass-rails', '~>4.0'
 gem 'coffee-rails', '~>4.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 251df7b7..bfb89849 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,29 +3,29 @@ GEM
   specs:
     RedCloth (4.2.9)
     aasm (3.2.1)
-    actionmailer (4.1.3)
-      actionpack (= 4.1.3)
-      actionview (= 4.1.3)
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
       mail (~> 2.5.4)
-    actionpack (4.1.3)
-      actionview (= 4.1.3)
-      activesupport (= 4.1.3)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionpack-xml_parser (1.0.1)
       actionpack (>= 4.0.0.rc1)
-    actionview (4.1.3)
-      activesupport (= 4.1.3)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.3)
-      activesupport (= 4.1.3)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
-    activerecord (4.1.3)
-      activemodel (= 4.1.3)
-      activesupport (= 4.1.3)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
       arel (~> 5.0.0)
-    activesupport (4.1.3)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -121,21 +121,21 @@ GEM
       rack (>= 1.1.3)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.3)
-      actionmailer (= 4.1.3)
-      actionpack (= 4.1.3)
-      actionview (= 4.1.3)
-      activemodel (= 4.1.3)
-      activerecord (= 4.1.3)
-      activesupport (= 4.1.3)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.3)
+      railties (= 4.1.4)
       sprockets-rails (~> 2.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.1.3)
-      actionpack (= 4.1.3)
-      activesupport (= 4.1.3)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -230,7 +230,7 @@ DEPENDENCIES
   mysql2
   rack-dev-mark
   rack-mini-profiler
-  rails (~> 4.1.3)
+  rails (~> 4.1.4)
   rails_autolink
   rspec-expectations
   sanitize