summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-05-19 21:08:07 -0500
committerConnor Shea <connor.james.shea@gmail.com>2016-05-19 21:08:07 -0500
commita5954080e95318f29790ac1baf6588c6c95184eb (patch)
treefb2244b6ed7143bc9f9afd615d6ce558eb259348 /Gemfile.lock
parentfa7a682bb05080855c8de29535e9626dde63c145 (diff)
downloadgitlab-ce-a5954080e95318f29790ac1baf6588c6c95184eb.tar.gz
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.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock12
1 files changed, 7 insertions, 5 deletions
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