From a5954080e95318f29790ac1baf6588c6c95184eb Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 19 May 2016 21:08:07 -0500
Subject: [PATCH] Upgrade activerecord-sessionstore from 0.1.2 to 1.0.0.

Changelog: https://github.com/rails/activerecord-session_store/releases/tag/v1.0.0

Includes Rails 5 support.
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 91ad1706a07..832c5a3ca89 100644
--- a/Gemfile
+++ b/Gemfile
@@ -325,7 +325,7 @@ gem "mail_room", "~> 0.7"
 gem 'email_reply_parser', '~> 0.5.8'
 
 ## CI
-gem 'activerecord-session_store', '~> 0.1.0'
+gem 'activerecord-session_store', '~> 1.0.0'
 gem "nested_form", '~> 0.3.2'
 
 # OAuth
diff --git a/Gemfile.lock b/Gemfile.lock
index b55764504c6..e1c5b9630d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,10 +33,12 @@ GEM
       activemodel (= 4.2.6)
       activesupport (= 4.2.6)
       arel (~> 6.0)
-    activerecord-session_store (0.1.2)
-      actionpack (>= 4.0.0, < 5)
-      activerecord (>= 4.0.0, < 5)
-      railties (>= 4.0.0, < 5)
+    activerecord-session_store (1.0.0)
+      actionpack (>= 4.0, < 5.1)
+      activerecord (>= 4.0, < 5.1)
+      multi_json (~> 1.11, >= 1.11.2)
+      rack (>= 1.5.2, < 3)
+      railties (>= 4.0, < 5.1)
     activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -883,7 +885,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (~> 4.2.9)
   ace-rails-ap (~> 4.0.2)
-  activerecord-session_store (~> 0.1.0)
+  activerecord-session_store (~> 1.0.0)
   acts-as-taggable-on (~> 3.4)
   addressable (~> 2.3.8)
   after_commit_queue