aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-12-26 23:16:01 +1030
committerMatthew Draper <matthew@trebex.net>2016-12-26 23:17:54 +1030
commit774be3ea3b9d25ab69daf11c5071deaf053d7d5b (patch)
tree2b9e7754a466e1bf094fb90e96f518649f41eb63 /Gemfile.lock
parenta46b2f8911c5730c8c56d487b65f7c5627d334ee (diff)
downloadrails-774be3ea3b9d25ab69daf11c5071deaf053d7d5b.tar.gz
rails-774be3ea3b9d25ab69daf11c5071deaf053d7d5b.tar.bz2
rails-774be3ea3b9d25ab69daf11c5071deaf053d7d5b.zip
bundle update
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock70
1 files changed, 30 insertions, 40 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4100d0e9f4..cb6774d79c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GIT
GIT
remote: https://github.com/resque/resque.git
- revision: 20d885065ac19e7f7d7a982f4ed1296083db0300
+ revision: 835a4a7e61a2e33832dbf11975ecfab54af293c6
specs:
resque (1.27.0)
mono_logger (~> 1.0)
@@ -49,13 +49,6 @@ GIT
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
-GIT
- remote: https://github.com/sass/sass.git
- revision: 7716e67f3507c6f65878c69aa49ec358ebf675c7
- branch: stable
- specs:
- sass (3.4.22)
-
PATH
remote: .
specs:
@@ -121,7 +114,7 @@ GEM
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
amq-protocol (2.0.1)
- arel (7.1.2)
+ arel (7.1.4)
ast (2.3.0)
backburner (1.3.1)
beaneater (~> 1.0)
@@ -132,7 +125,7 @@ GEM
bcrypt (3.1.11-x86-mingw32)
beaneater (1.0.0)
benchmark-ips (2.7.2)
- blade (0.6.1)
+ blade (0.7.0)
activesupport (>= 3.0.0)
blade-qunit_adapter (~> 2.0.1)
coffee-script
@@ -141,17 +134,16 @@ GEM
eventmachine
faye
sprockets (>= 3.0)
- sprockets-export (~> 0.9.1)
thin (>= 1.6.0)
thor (~> 0.19.1)
useragent (~> 0.16.7)
blade-qunit_adapter (2.0.1)
- blade-sauce_labs_plugin (0.6.1)
+ blade-sauce_labs_plugin (0.6.2)
childprocess
faraday
selenium-webdriver
builder (3.2.2)
- bunny (2.2.2)
+ bunny (2.6.2)
amq-protocol (>= 2.0.1)
byebug (9.0.6)
childprocess (0.5.9)
@@ -164,7 +156,7 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.3)
- connection_pool (2.2.0)
+ connection_pool (2.2.1)
cookiejar (0.3.3)
curses (1.0.2)
daemons (1.2.4)
@@ -201,8 +193,6 @@ GEM
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.9.14)
- ffi (1.9.14-x64-mingw32)
- ffi (1.9.14-x86-mingw32)
globalid (0.3.7)
activesupport (>= 4.1.0)
hiredis (0.6.1)
@@ -248,15 +238,15 @@ GEM
mini_portile2 (~> 2.1.0)
nokogiri (1.6.8.1-x86-mingw32)
mini_portile2 (~> 2.1.0)
- parser (2.3.2.0)
+ parser (2.3.3.1)
ast (~> 2.2)
pg (0.19.0)
pg (0.19.0-x64-mingw32)
pg (0.19.0-x86-mingw32)
powerpack (0.1.1)
- psych (2.1.1)
+ psych (2.2.2)
public_suffix (2.0.4)
- puma (3.6.0)
+ puma (3.6.2)
qu (0.2.0)
multi_json
qu-redis (0.2.0)
@@ -279,10 +269,10 @@ GEM
loofah (~> 2.0)
rainbow (2.1.0)
rake (12.0.0)
- rb-fsevent (0.9.7)
+ rb-fsevent (0.9.8)
rdoc (5.0.0)
redcarpet (3.2.3)
- redis (3.3.1)
+ redis (3.3.2)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
resque-scheduler (4.3.0)
@@ -290,16 +280,18 @@ GEM
redis (~> 3.3)
resque (~> 1.26)
rufus-scheduler (~> 3.2)
- rubocop (0.45.0)
+ rubocop (0.46.0)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1)
- ruby_dep (1.4.0)
+ ruby_dep (1.5.0)
rubyzip (1.2.0)
- rufus-scheduler (3.2.2)
+ rufus-scheduler (3.3.1)
+ tzinfo
+ sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
@@ -308,31 +300,30 @@ GEM
tilt (>= 1.1, < 3)
sdoc (1.0.0.rc1)
rdoc (= 5.0.0)
- selenium-webdriver (3.0.1)
+ selenium-webdriver (3.0.4)
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)
- sequel (4.39.0)
+ sequel (4.41.0)
serverengine (1.5.11)
sigdump (~> 0.2.2)
- sidekiq (4.2.2)
+ sidekiq (4.2.7)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
- rack-protection (~> 1.5)
+ rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
sigdump (0.2.4)
simple_uuid (0.4.0)
sinatra (1.0)
rack (>= 1.0)
- sneakers (2.3.5)
- bunny (~> 2.2.0)
+ sneakers (2.4.0)
+ bunny (~> 2.6)
serverengine (~> 1.5.11)
thor
thread (~> 0.1.7)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-export (0.9.1)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
@@ -347,7 +338,7 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
- thor (0.19.1)
+ thor (0.19.4)
thread (0.1.7)
thread_safe (0.3.5)
tilt (2.0.5)
@@ -356,17 +347,17 @@ GEM
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- tzinfo-data (1.2016.7)
+ tzinfo-data (1.2016.10)
tzinfo (>= 1.0.0)
- uglifier (3.0.2)
+ uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
- unicode-display_width (1.1.1)
+ unicode-display_width (1.1.2)
useragent (0.16.8)
vegas (0.1.11)
rack (>= 1.0.0)
- w3c_validators (1.2)
- json
- nokogiri
+ w3c_validators (1.3.1)
+ json (~> 2.0)
+ nokogiri (~> 1.6)
wdm (0.1.1)
websocket (1.2.3)
websocket-driver (0.6.4)
@@ -419,7 +410,6 @@ DEPENDENCIES
resque!
resque-scheduler
rubocop
- sass!
sass-rails
sdoc (= 1.0.0.rc1)
sequel
@@ -436,4 +426,4 @@ DEPENDENCIES
websocket-client-simple!
BUNDLED WITH
- 1.13.6
+ 1.13.7