summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock18
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c4d9fa0e2d..85e8ab7b45b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,7 +76,7 @@ GEM
carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- celluloid (0.13.0)
+ celluloid (0.14.0)
timers (>= 1.0.0)
charlock_holmes (0.6.9.4)
chosen-rails (0.9.8)
@@ -106,7 +106,7 @@ GEM
database_cleaner (0.9.1)
debug_inspector (0.0.2)
descendants_tracker (0.0.1)
- devise (2.2.3)
+ devise (2.2.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@@ -260,7 +260,7 @@ GEM
minitest (4.7.4)
modernizr (2.6.2)
sprockets (~> 2.0)
- multi_json (1.7.2)
+ multi_json (1.7.3)
multi_xml (0.5.3)
multipart-post (1.2.0)
mysql2 (0.3.11)
@@ -365,7 +365,7 @@ GEM
redis-activesupport (3.2.3)
activesupport (~> 3.2.3)
redis-store (~> 1.1.0)
- redis-namespace (1.2.1)
+ redis-namespace (1.3.0)
redis (~> 3.0.0)
redis-rack (1.4.2)
rack (~> 1.4.1)
@@ -416,11 +416,11 @@ GEM
sexp_processor (4.2.1)
shoulda-matchers (1.3.0)
activesupport (>= 3.0.0)
- sidekiq (2.11.1)
- celluloid (~> 0.13.0)
- connection_pool (~> 1.0)
- multi_json (~> 1)
- redis (~> 3)
+ sidekiq (2.12.0)
+ celluloid (>= 0.14.0)
+ connection_pool (>= 1.0.0)
+ json
+ redis (>= 3.0)
redis-namespace
simple_oauth (0.1.9)
simplecov (0.7.1)