Merge branch 'master' into always-inherit-from-application-record

1 files changed, 174 insertions, 102 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 3bbaee414f..7cddaa7e3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,30 +1,49 @@
 GIT
   remote: git://github.com/QueueClassic/queue_classic.git
-  revision: 2e3b624f3043849751b24a758d8c156337ead862
+  revision: c26f2c9f6f6133b946fbcdd7b7ec905a4aca9f94
   branch: master
   specs:
     queue_classic (3.2.0.RC1)
       pg (>= 0.17, < 0.19)
 
 GIT
-  remote: git://github.com/bkeepers/qu.git
-  revision: d098e2657c92e89a6413bebd9c033930759c061f
-  branch: master
+  remote: git://github.com/collectiveidea/delayed_job.git
+  revision: 71f1d5faf934d3057abca942f0d410327bc69087
   specs:
-    qu (0.2.0)
-    qu-rails (0.2.0)
-      qu (= 0.2.0)
-      railties (>= 3.2, < 5)
-    qu-redis (0.2.0)
-      qu (= 0.2.0)
-      redis-namespace
+    delayed_job (4.1.1)
+      activesupport (>= 3.0, < 5.1)
+
+GIT
+  remote: git://github.com/collectiveidea/delayed_job_active_record.git
+  revision: 61e688e03b2ef4004b08de6d1e0a123fda8fffad
+  specs:
+    delayed_job_active_record (4.1.0)
+      activerecord (>= 3.0, < 5.1)
+      delayed_job (>= 3.0, < 5)
+
+GIT
+  remote: git://github.com/javan/blade-sauce_labs_plugin.git
+  revision: dd4230c556aaa19b62cca757d6faeb2bb6bf95e7
+  specs:
+    blade-sauce_labs_plugin (0.5.1)
+      childprocess
+      faraday
+      selenium-webdriver
+
+GIT
+  remote: git://github.com/rails/coffee-rails.git
+  revision: aa2e623cbda4f3c789a0a15d1f707239e68f5736
+  specs:
+    coffee-rails (4.1.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.2.x)
 
 GIT
   remote: git://github.com/sass/sass.git
-  revision: ac8e7aa8e99c425237c708f347f76495a2e18519
+  revision: 3fda1cbe70d615e7ef96e28db4fd1f8a3ebb5505
   branch: stable
   specs:
-    sass (3.4.21)
+    sass (3.4.22)
 
 GIT
   remote: git://github.com/turbolinks/turbolinks-rails.git
@@ -36,58 +55,58 @@ GIT
 PATH
   remote: .
   specs:
-    actioncable (5.0.0.beta3)
-      actionpack (= 5.0.0.beta3)
+    actioncable (5.1.0.alpha)
+      actionpack (= 5.1.0.alpha)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.beta3)
-      actionpack (= 5.0.0.beta3)
-      actionview (= 5.0.0.beta3)
-      activejob (= 5.0.0.beta3)
+    actionmailer (5.1.0.alpha)
+      actionpack (= 5.1.0.alpha)
+      actionview (= 5.1.0.alpha)
+      activejob (= 5.1.0.alpha)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (5.0.0.beta3)
-      actionview (= 5.0.0.beta3)
-      activesupport (= 5.0.0.beta3)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.0.alpha)
+      actionview (= 5.1.0.alpha)
+      activesupport (= 5.1.0.alpha)
       rack (~> 2.x)
       rack-test (~> 0.6.3)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.beta3)
-      activesupport (= 5.0.0.beta3)
+    actionview (5.1.0.alpha)
+      activesupport (= 5.1.0.alpha)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.beta3)
-      activesupport (= 5.0.0.beta3)
+    activejob (5.1.0.alpha)
+      activesupport (= 5.1.0.alpha)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.beta3)
-      activesupport (= 5.0.0.beta3)
-    activerecord (5.0.0.beta3)
-      activemodel (= 5.0.0.beta3)
-      activesupport (= 5.0.0.beta3)
+    activemodel (5.1.0.alpha)
+      activesupport (= 5.1.0.alpha)
+    activerecord (5.1.0.alpha)
+      activemodel (= 5.1.0.alpha)
+      activesupport (= 5.1.0.alpha)
       arel (~> 7.0)
-    activesupport (5.0.0.beta3)
-      concurrent-ruby (~> 1.0)
+    activesupport (5.1.0.alpha)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    rails (5.0.0.beta3)
-      actioncable (= 5.0.0.beta3)
-      actionmailer (= 5.0.0.beta3)
-      actionpack (= 5.0.0.beta3)
-      actionview (= 5.0.0.beta3)
-      activejob (= 5.0.0.beta3)
-      activemodel (= 5.0.0.beta3)
-      activerecord (= 5.0.0.beta3)
-      activesupport (= 5.0.0.beta3)
+    rails (5.1.0.alpha)
+      actioncable (= 5.1.0.alpha)
+      actionmailer (= 5.1.0.alpha)
+      actionpack (= 5.1.0.alpha)
+      actionview (= 5.1.0.alpha)
+      activejob (= 5.1.0.alpha)
+      activemodel (= 5.1.0.alpha)
+      activerecord (= 5.1.0.alpha)
+      activesupport (= 5.1.0.alpha)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.beta3)
+      railties (= 5.1.0.alpha)
       sprockets-rails (>= 2.0.0)
-    railties (5.0.0.beta3)
-      actionpack (= 5.0.0.beta3)
-      activesupport (= 5.0.0.beta3)
+    railties (5.1.0.alpha)
+      actionpack (= 5.1.0.alpha)
+      activesupport (= 5.1.0.alpha)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -95,42 +114,74 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.4.0)
     amq-protocol (2.0.1)
     arel (7.0.0)
-    backburner (1.2.0)
+    backburner (1.3.0)
       beaneater (~> 1.0)
       dante (> 0.1.5)
     bcrypt (3.1.11)
     bcrypt (3.1.11-x64-mingw32)
     bcrypt (3.1.11-x86-mingw32)
     beaneater (1.0.0)
-    benchmark-ips (2.3.0)
+    benchmark-ips (2.6.1)
+    blade (0.5.5)
+      activesupport (>= 3.0.0)
+      blade-qunit_adapter (~> 1.20.0)
+      coffee-script
+      coffee-script-source
+      curses (~> 1.0.0)
+      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 (1.20.0)
     builder (3.2.2)
     bunny (2.2.2)
       amq-protocol (>= 2.0.1)
-    byebug (8.2.1)
-    coffee-rails (4.1.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+    byebug (8.2.5)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     connection_pool (2.2.0)
+    cookiejar (0.3.0)
+    curses (1.0.2)
+    daemons (1.2.3)
     dalli (2.7.6)
     dante (0.2.0)
-    delayed_job (4.1.1)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.1.0)
-      activerecord (>= 3.0, < 5)
-      delayed_job (>= 3.0, < 5)
     em-hiredis (0.3.1)
       eventmachine (~> 1.0)
       hiredis (~> 0.6.0)
+    em-http-request (1.1.3)
+      addressable (>= 2.3.4)
+      cookiejar (<= 0.3.0)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.1)
+      eventmachine (>= 1.0.0.beta.4)
     erubis (2.7.0)
-    eventmachine (1.0.9.1)
+    eventmachine (1.2.0.1)
+    eventmachine (1.2.0.1-x64-mingw32)
+    eventmachine (1.2.0.1-x86-mingw32)
     execjs (2.6.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    faye (1.1.2)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 0.3.0)
+      eventmachine (>= 0.12.0)
+      faye-websocket (>= 0.9.1)
+      multi_json (>= 1.0.0)
+      rack (>= 1.0.0)
+      websocket-driver (>= 0.5.1)
     faye-websocket (0.10.3)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
@@ -140,32 +191,36 @@ GEM
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     hiredis (0.6.1)
+    http_parser.rb (0.6.0)
     i18n (0.7.0)
-    jquery-rails (4.1.0)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     kindlerb (0.1.1)
       mustache
       nokogiri
-    listen (3.0.5)
+    listen (3.0.7)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+      rb-inotify (>= 0.9.7)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.99.1)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.3.3)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
-    multi_json (1.11.2)
-    mustache (1.0.2)
+    multi_json (1.12.0)
+    multipart-post (2.0.0)
+    mustache (1.0.3)
     mysql2 (0.4.4)
     mysql2 (0.4.4-x64-mingw32)
     mysql2 (0.4.4-x86-mingw32)
@@ -180,30 +235,34 @@ GEM
     pg (0.18.4-x64-mingw32)
     pg (0.18.4-x86-mingw32)
     psych (2.0.17)
-    puma (2.16.0)
-    que (0.11.2)
+    puma (3.4.0)
+    qu (0.2.0)
+      multi_json
+    qu-redis (0.2.0)
+      qu (= 0.2.0)
+      redis-namespace
+      simple_uuid
+    que (0.11.4)
     racc (1.4.14)
-    rack (2.0.0.alpha)
+    rack (2.0.0.rc1)
       json
-    rack-cache (1.5.1)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (2.0.0)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rake (11.1.1)
+    rake (11.1.2)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdoc (4.2.1)
+    rdoc (4.2.2)
+      json (~> 1.4)
     redcarpet (3.2.3)
-    redis (3.2.2)
+    redis (3.3.0)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
@@ -212,23 +271,29 @@ GEM
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-scheduler (4.0.0)
+    resque-scheduler (4.2.0)
       mono_logger (~> 1.0)
       redis (~> 3.0)
       resque (~> 1.25)
-      rufus-scheduler (~> 3.0)
-    rufus-scheduler (3.2.0)
+      rufus-scheduler (~> 3.2)
+    rubyzip (1.2.0)
+    rufus-scheduler (3.2.1)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    sequel (4.30.0)
+    selenium-webdriver (2.53.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+    sequel (4.34.0)
     serverengine (1.5.11)
       sigdump (~> 0.2.2)
-    sidekiq (4.0.2)
+    sidekiq (4.1.2)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       redis (~> 3.2, >= 3.2.1)
-    sigdump (0.2.3)
+    sigdump (0.2.4)
+    simple_uuid (0.4.0)
     sinatra (1.0)
       rack (>= 1.0)
     sneakers (2.3.5)
@@ -236,9 +301,10 @@ GEM
       serverengine (~> 1.5.11)
       thor
       thread (~> 0.1.7)
-    sprockets (3.5.2)
+    sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
+    sprockets-export (0.9.1)
     sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
@@ -246,26 +312,31 @@ GEM
     sqlite3 (1.3.11)
     sqlite3 (1.3.11-x64-mingw32)
     sqlite3 (1.3.11-x86-mingw32)
-    stackprof (0.2.8)
-    sucker_punch (2.0.0)
+    stackprof (0.2.9)
+    sucker_punch (2.0.2)
       concurrent-ruby (~> 1.0.0)
+    thin (1.6.2)
+      daemons (>= 1.0.9)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.0.0)
     thor (0.19.1)
     thread (0.1.7)
     thread_safe (0.3.5)
-    turbolinks-source (5.0.0.beta2)
+    turbolinks-source (5.0.0.beta4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2015.7)
+    tzinfo-data (1.2016.4)
       tzinfo (>= 1.0.0)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
+    useragent (0.16.7)
     vegas (0.1.11)
       rack (>= 1.0.0)
     w3c_validators (1.2)
       json
       nokogiri
     wdm (0.1.1)
+    websocket (1.2.3)
     websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -282,11 +353,13 @@ DEPENDENCIES
   backburner
   bcrypt (~> 3.1.11)
   benchmark-ips
+  blade (~> 0.5.5)
+  blade-sauce_labs_plugin!
   byebug
-  coffee-rails (~> 4.1.0)
+  coffee-rails!
   dalli (>= 2.2.1)
-  delayed_job
-  delayed_job_active_record
+  delayed_job!
+  delayed_job_active_record!
   em-hiredis
   faye-websocket
   hiredis
@@ -300,7 +373,6 @@ DEPENDENCIES
   pg (>= 0.18.0)
   psych (~> 2.0)
   puma
-  qu-rails!
   qu-redis
   que
   queue_classic!