Merge branch 'master' into make-reverse-merge-bang-order-consistent

1 files changed, 89 insertions, 79 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 74f76f9e7c..f06b9a32f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,12 +7,10 @@ GIT
       pg (>= 0.17, < 0.20)
 
 GIT
-  remote: https://github.com/matthewd/rb-inotify.git
-  revision: 90553518d1fb79aedc98a3036c59bd2b6731ac40
-  branch: close-handling
+  remote: https://github.com/erikhuda/thor.git
+  revision: df5ba2b653a28087b3617d6c082b00866b0c0d6c
   specs:
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
+    thor (0.19.4)
 
 GIT
   remote: https://github.com/matthewd/websocket-client-simple.git
@@ -23,61 +21,67 @@ GIT
       event_emitter
       websocket
 
+GIT
+  remote: https://github.com/rails/arel.git
+  revision: 67a51c62f4e19390cd8eb408596ca48bb0806362
+  specs:
+    arel (8.0.0)
+
 PATH
   remote: .
   specs:
-    actioncable (5.1.0.beta1)
-      actionpack (= 5.1.0.beta1)
+    actioncable (5.2.0.alpha)
+      actionpack (= 5.2.0.alpha)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.0.beta1)
-      actionpack (= 5.1.0.beta1)
-      actionview (= 5.1.0.beta1)
-      activejob (= 5.1.0.beta1)
+    actionmailer (5.2.0.alpha)
+      actionpack (= 5.2.0.alpha)
+      actionview (= 5.2.0.alpha)
+      activejob (= 5.2.0.alpha)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.0.beta1)
-      actionview (= 5.1.0.beta1)
-      activesupport (= 5.1.0.beta1)
+    actionpack (5.2.0.alpha)
+      actionview (= 5.2.0.alpha)
+      activesupport (= 5.2.0.alpha)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.0.beta1)
-      activesupport (= 5.1.0.beta1)
+    actionview (5.2.0.alpha)
+      activesupport (= 5.2.0.alpha)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.0.beta1)
-      activesupport (= 5.1.0.beta1)
+    activejob (5.2.0.alpha)
+      activesupport (= 5.2.0.alpha)
       globalid (>= 0.3.6)
-    activemodel (5.1.0.beta1)
-      activesupport (= 5.1.0.beta1)
-    activerecord (5.1.0.beta1)
-      activemodel (= 5.1.0.beta1)
-      activesupport (= 5.1.0.beta1)
+    activemodel (5.2.0.alpha)
+      activesupport (= 5.2.0.alpha)
+    activerecord (5.2.0.alpha)
+      activemodel (= 5.2.0.alpha)
+      activesupport (= 5.2.0.alpha)
       arel (~> 8.0)
-    activesupport (5.1.0.beta1)
+    activesupport (5.2.0.alpha)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    rails (5.1.0.beta1)
-      actioncable (= 5.1.0.beta1)
-      actionmailer (= 5.1.0.beta1)
-      actionpack (= 5.1.0.beta1)
-      actionview (= 5.1.0.beta1)
-      activejob (= 5.1.0.beta1)
-      activemodel (= 5.1.0.beta1)
-      activerecord (= 5.1.0.beta1)
-      activesupport (= 5.1.0.beta1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.0.beta1)
+    rails (5.2.0.alpha)
+      actioncable (= 5.2.0.alpha)
+      actionmailer (= 5.2.0.alpha)
+      actionpack (= 5.2.0.alpha)
+      actionview (= 5.2.0.alpha)
+      activejob (= 5.2.0.alpha)
+      activemodel (= 5.2.0.alpha)
+      activerecord (= 5.2.0.alpha)
+      activesupport (= 5.2.0.alpha)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0.alpha)
       sprockets-rails (>= 2.0.0)
-    railties (5.1.0.beta1)
-      actionpack (= 5.1.0.beta1)
-      activesupport (= 5.1.0.beta1)
+    railties (5.2.0.alpha)
+      actionpack (= 5.2.0.alpha)
+      activesupport (= 5.2.0.alpha)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -85,10 +89,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     amq-protocol (2.1.0)
-    arel (8.0.0)
     ast (2.3.0)
     backburner (1.3.1)
       beaneater (~> 1.0)
@@ -120,7 +123,7 @@ GEM
     bunny (2.6.2)
       amq-protocol (>= 2.0.1)
     byebug (9.0.6)
-    capybara (2.7.1)
+    capybara (2.14.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -136,17 +139,17 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     cookiejar (0.3.3)
     curses (1.0.2)
     daemons (1.2.4)
     dalli (2.7.6)
     dante (0.2.0)
-    delayed_job (4.1.2)
-      activesupport (>= 3.0, < 5.1)
-    delayed_job_active_record (4.1.1)
-      activerecord (>= 3.0, < 5.1)
+    delayed_job (4.1.3)
+      activesupport (>= 3.0, < 5.2)
+    delayed_job_active_record (4.1.2)
+      activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
     em-hiredis (0.3.1)
       eventmachine (~> 1.0)
@@ -159,7 +162,7 @@ GEM
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.1)
       eventmachine (>= 1.0.0.beta.4)
-    erubi (1.4.0)
+    erubi (1.6.0)
     erubis (2.7.0)
     event_emitter (0.2.5)
     eventmachine (1.2.1)
@@ -182,8 +185,8 @@ GEM
     ffi (1.9.17)
     ffi (1.9.17-x64-mingw32)
     ffi (1.9.17-x86-mingw32)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     hiredis (0.6.1)
     http_parser.rb (0.6.0)
     i18n (0.8.1)
@@ -202,14 +205,14 @@ GEM
       ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
     minitest (5.3.3)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
@@ -217,16 +220,17 @@ GEM
     multi_json (1.12.1)
     multipart-post (2.0.0)
     mustache (1.0.3)
-    mysql2 (0.4.5)
-    mysql2 (0.4.5-x64-mingw32)
-    mysql2 (0.4.5-x86-mingw32)
+    mysql2 (0.4.6)
+    mysql2 (0.4.6-x64-mingw32)
+    mysql2 (0.4.6-x86-mingw32)
     nio4r (2.0.0)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
-    nokogiri (1.7.0.1-x64-mingw32)
-      mini_portile2 (~> 2.1.0)
-    nokogiri (1.7.0.1-x86-mingw32)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.0-x64-mingw32)
+      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.0-x86-mingw32)
+      mini_portile2 (~> 2.2.0)
+    parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.19.0)
@@ -244,10 +248,10 @@ GEM
       simple_uuid
     que (0.12.0)
     racc (1.4.14)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-cache (1.6.1)
       rack (>= 0.4)
-    rack-protection (1.5.3)
+    rack-protection (2.0.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -256,12 +260,15 @@ GEM
       nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
     rb-fsevent (0.9.8)
-    rdoc (5.0.0)
+    rb-inotify (0.9.9)
+      ffi (~> 1.0)
+    rdoc (5.1.0)
     redcarpet (3.2.3)
-    redis (3.3.2)
+    redis (3.3.3)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     resque (1.27.0)
@@ -275,7 +282,8 @@ GEM
       redis (~> 3.3)
       resque (~> 1.26)
       rufus-scheduler (~> 3.2)
-    rubocop (0.47.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -293,8 +301,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sdoc (1.0.0.rc1)
-      rdoc (= 5.0.0)
+    sdoc (1.0.0.rc2)
+      rdoc (~> 5.0)
     selenium-webdriver (3.0.5)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
@@ -302,11 +310,11 @@ GEM
     sequel (4.42.1)
     serverengine (1.5.11)
       sigdump (~> 0.2.2)
-    sidekiq (4.2.9)
+    sidekiq (5.0.0)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
+      redis (~> 3.3, >= 3.3.3)
     sigdump (0.2.4)
     simple_uuid (0.4.0)
     sinatra (1.0)
@@ -319,6 +327,7 @@ GEM
     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)
@@ -333,20 +342,19 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.19.4)
     thread (0.1.7)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tilt (2.0.5)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     tzinfo-data (1.2016.10)
       tzinfo (>= 1.0.0)
     uglifier (3.0.4)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.2.1)
     useragent (0.16.8)
     vegas (0.1.11)
       rack (>= 1.0.0)
@@ -358,7 +366,7 @@ GEM
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    xpath (2.0.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -370,13 +378,14 @@ DEPENDENCIES
   activerecord-jdbcmysql-adapter (>= 1.3.0)
   activerecord-jdbcpostgresql-adapter (>= 1.3.0)
   activerecord-jdbcsqlite3-adapter (>= 1.3.0)
+  arel!
   backburner
   bcrypt (~> 3.1.11)
   benchmark-ips
   blade
   blade-sauce_labs_plugin
   byebug
-  capybara (~> 2.7.0)
+  capybara (~> 2.13)
   coffee-rails
   dalli (>= 2.2.1)
   delayed_job
@@ -403,20 +412,21 @@ DEPENDENCIES
   rack-cache (~> 1.2)
   rails!
   rake (>= 11.1)
-  rb-inotify!
   redcarpet (~> 3.2.3)
   redis
   resque
   resque-scheduler
   rubocop (>= 0.47)
   sass-rails
-  sdoc (= 1.0.0.rc1)
+  sdoc (> 1.0.0.rc1, < 2.0)
   sequel
   sidekiq
   sneakers
+  sprockets-export
   sqlite3 (~> 1.3.6)
   stackprof
   sucker_punch
+  thor!
   turbolinks (~> 5)
   tzinfo-data
   uglifier (>= 1.3.0)
@@ -425,4 +435,4 @@ DEPENDENCIES
   websocket-client-simple!
 
 BUNDLED WITH
-   1.14.4
+   1.15.1