From 0ad7ea7fd9d8a45b0430be083666c8d3735746f9 Mon Sep 17 00:00:00 2001
From: Dominik Sander <git@dsander.de>
Date: Sat, 28 Feb 2015 11:49:17 +0100
Subject: [PATCH] Upgrade to rails-4.2.1rc2

Rails 4.2 introduced precision of datetime files for mysql >= 4.6,
however in 4.2.0 the rounding was broken rails/rails!18067 fixes that.
---
 Gemfile      |  2 +-
 Gemfile.lock | 66 ++++++++++++++++++++++++++--------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Gemfile b/Gemfile
index e1060d339e..f12bb2cf0c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem 'mysql2', '~> 0.3.16'
 gem 'multi_xml'
 gem 'nokogiri', '~> 1.6.4'
 gem 'omniauth'
-gem 'rails' , '4.2.0'
+gem 'rails' , '4.2.1rc2'
 gem 'rufus-scheduler', '~> 3.0.8', require: false
 gem 'sass-rails',   '~> 5.0'
 gem 'select2-rails', '~> 3.5.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index f58af5897d..f34c27ebf5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,36 +12,36 @@ GEM
   remote: https://rubygems.org/
   specs:
     ace-rails-ap (2.0.1)
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.1.rc2)
+      actionpack (= 4.2.1.rc2)
+      actionview (= 4.2.1.rc2)
+      activejob (= 4.2.1.rc2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.1.rc2)
+      actionview (= 4.2.1.rc2)
+      activesupport (= 4.2.1.rc2)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+    actionview (4.2.1.rc2)
+      activesupport (= 4.2.1.rc2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+    activejob (4.2.1.rc2)
+      activesupport (= 4.2.1.rc2)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.1.rc2)
+      activesupport (= 4.2.1.rc2)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.1.rc2)
+      activemodel (= 4.2.1.rc2)
+      activesupport (= 4.2.1.rc2)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.1.rc2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -229,9 +229,9 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (1.25.1)
     mini_portile (0.6.2)
-    minitest (5.5.0)
+    minitest (5.5.1)
     mqtt (0.3.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
@@ -284,16 +284,16 @@ GEM
     rack (1.6.0)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.1.rc2)
+      actionmailer (= 4.2.1.rc2)
+      actionpack (= 4.2.1.rc2)
+      actionview (= 4.2.1.rc2)
+      activejob (= 4.2.1.rc2)
+      activemodel (= 4.2.1.rc2)
+      activerecord (= 4.2.1.rc2)
+      activesupport (= 4.2.1.rc2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.1.rc2)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -308,9 +308,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.3)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.1.rc2)
+      actionpack (= 4.2.1.rc2)
+      activesupport (= 4.2.1.rc2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -528,7 +528,7 @@ DEPENDENCIES
   pry
   quiet_assets
   rack
-  rails (= 4.2.0)
+  rails (= 4.2.1rc2)
   rails_12factor
   rr
   rspec (~> 3.2)