aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock38
1 files changed, 18 insertions, 20 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1453bddb34..8dc20f1ad3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,16 +24,6 @@ GIT
websocket
GIT
- remote: https://github.com/resque/resque-scheduler.git
- revision: 284b862dd63967da1cf3a7e6abd9d2052067c8be
- specs:
- resque-scheduler (4.3.0)
- mono_logger (~> 1.0)
- redis (>= 3.3, < 5)
- resque (~> 1.26)
- rufus-scheduler (~> 3.2)
-
-GIT
remote: https://github.com/robin850/sdoc.git
revision: 0e340352f3ab2f196c8a8743f83c2ee286e4f71c
branch: upgrade
@@ -315,7 +305,7 @@ GEM
mime-types-data (3.2016.0521)
mini_magick (4.8.0)
mini_mime (0.1.4)
- mini_portile2 (2.2.0)
+ mini_portile2 (2.3.0)
minitest (5.10.3)
minitest-bisect (1.4.0)
minitest-server (~> 1.0)
@@ -337,13 +327,14 @@ GEM
mysql2 (0.4.9-x64-mingw32)
mysql2 (0.4.9-x86-mingw32)
nio4r (2.1.0)
- nokogiri (1.8.0)
- mini_portile2 (~> 2.2.0)
- nokogiri (1.8.0-java)
- nokogiri (1.8.0-x64-mingw32)
- mini_portile2 (~> 2.2.0)
- nokogiri (1.8.0-x86-mingw32)
- mini_portile2 (~> 2.2.0)
+ nio4r (2.1.0-java)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
+ nokogiri (1.8.1-java)
+ nokogiri (1.8.1-x64-mingw32)
+ mini_portile2 (~> 2.3.0)
+ nokogiri (1.8.1-x86-mingw32)
+ mini_portile2 (~> 2.3.0)
os (0.9.6)
parallel (1.12.0)
parser (2.4.0.0)
@@ -393,6 +384,11 @@ GEM
redis-namespace (~> 1.3)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
+ resque-scheduler (4.3.1)
+ mono_logger (~> 1.0)
+ redis (>= 3.3, < 5)
+ resque (~> 1.26)
+ rufus-scheduler (~> 3.2)
retriable (3.1.1)
rubocop (0.51.0)
parallel (~> 1.10)
@@ -488,6 +484,8 @@ GEM
websocket (1.2.4)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
+ websocket-driver (0.6.5-java)
+ websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.1.0)
nokogiri (~> 1.3)
@@ -527,7 +525,7 @@ DEPENDENCIES
minitest-bisect
mocha
mysql2 (>= 0.4.4)
- nokogiri (>= 1.6.8)
+ nokogiri (>= 1.8.1)
pg (>= 0.18.0)
psych (~> 2.0)
puma
@@ -543,7 +541,7 @@ DEPENDENCIES
redis (~> 4.0)
redis-namespace
resque
- resque-scheduler!
+ resque-scheduler
rubocop (>= 0.47)
sass-rails
sdoc!