From e6655e7d7e44ee2850163de093da96a76c2ef38f Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Fri, 24 Apr 2015 15:36:46 -0400
Subject: [PATCH] Bump rails to latest patch 4.1 release. (4.1.10)

We should be using the latest patch release of the current supported
version.
Also this adds a more explicit version of rails on the Gemfile. This is
will help to test on rails 4.2 and master.
---
 Gemfile      |  4 ++--
 Gemfile.lock | 58 ++++++++++++++++++++++++++--------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Gemfile b/Gemfile
index 50a64cb1392..d05c8bb3393 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,9 +74,9 @@ if rails_master?
   gem 'rails-observers', git: 'https://github.com/SamSaffron/rails-observers.git'
   gem 'seed-fu', git: 'https://github.com/SamSaffron/seed-fu.git', branch: 'discourse'
 else
-  gem 'seed-fu', '~> 2.3.3'
-  gem 'rails'
+  gem 'rails', '~> 4.1.10'
   gem 'rails-observers'
+  gem 'seed-fu', '~> 2.3.3'
 end
 
 gem 'actionpack-action_caching'
diff --git a/Gemfile.lock b/Gemfile.lock
index 865cf4252e6..7e4c43b4c4b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,31 +7,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    actionmailer (4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
+    actionmailer (4.1.10)
+      actionpack (= 4.1.10)
+      actionview (= 4.1.10)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.9)
-      actionview (= 4.1.9)
-      activesupport (= 4.1.9)
+    actionpack (4.1.10)
+      actionview (= 4.1.10)
+      activesupport (= 4.1.10)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionpack-action_caching (1.1.1)
       actionpack (>= 4.0.0, < 5.0)
-    actionview (4.1.9)
-      activesupport (= 4.1.9)
+    actionview (4.1.10)
+      activesupport (= 4.1.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     active_model_serializers (0.8.2)
       activemodel (>= 3.0)
-    activemodel (4.1.9)
-      activesupport (= 4.1.9)
+    activemodel (4.1.10)
+      activesupport (= 4.1.10)
       builder (~> 3.1)
-    activerecord (4.1.9)
-      activemodel (= 4.1.9)
-      activesupport (= 4.1.9)
+    activerecord (4.1.10)
+      activemodel (= 4.1.10)
+      activesupport (= 4.1.10)
       arel (~> 5.0.0)
-    activesupport (4.1.9)
+    activesupport (4.1.10)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -221,13 +221,13 @@ GEM
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.6.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mock_redis (0.14.0)
     moneta (0.8.0)
     msgpack (0.5.11)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mustache (0.99.8)
@@ -305,21 +305,21 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.9)
-      actionmailer (= 4.1.9)
-      actionpack (= 4.1.9)
-      actionview (= 4.1.9)
-      activemodel (= 4.1.9)
-      activerecord (= 4.1.9)
-      activesupport (= 4.1.9)
+    rails (4.1.10)
+      actionmailer (= 4.1.10)
+      actionpack (= 4.1.10)
+      actionview (= 4.1.10)
+      activemodel (= 4.1.10)
+      activerecord (= 4.1.10)
+      activesupport (= 4.1.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.9)
+      railties (= 4.1.10)
       sprockets-rails (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.1.9)
-      actionpack (= 4.1.9)
-      activesupport (= 4.1.9)
+    railties (4.1.10)
+      actionpack (= 4.1.10)
+      activesupport (= 4.1.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -430,7 +430,7 @@ GEM
       eventmachine (~> 1.0)
       rack (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timecop (0.7.3)
     timers (4.0.1)
@@ -513,7 +513,7 @@ DEPENDENCIES
   qunit-rails
   rack-mini-profiler
   rack-protection
-  rails
+  rails (~> 4.1.10)
   rails-observers
   rails_multisite!
   rake