diff --git a/Gemfile b/Gemfile
index 7fc8aa75521..0b98dc1f750 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,6 @@ gem "arel", github: "rails/arel"
 
 # We need a newish Rake since Active Job sets its test tasks' descriptions.
 gem "rake", ">= 11.1"
-gem "thor", github: "erikhuda/thor"
 
 # This needs to be with require false to ensure correct loading order, as it has to
 # be loaded after loading the test library.
diff --git a/Gemfile.lock b/Gemfile.lock
index 0738e1c35d3..2096465a8bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,12 +6,6 @@ GIT
     queue_classic (3.2.0.RC1)
       pg (>= 0.17, < 0.20)
 
-GIT
-  remote: https://github.com/erikhuda/thor.git
-  revision: df5ba2b653a28087b3617d6c082b00866b0c0d6c
-  specs:
-    thor (0.19.4)
-
 GIT
   remote: https://github.com/matthewd/rb-inotify.git
   revision: 856730aad4b285969e8dd621e44808a7c5af4242
@@ -31,7 +25,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/arel.git
-  revision: f4227bf20a16a1d688afc24cf0038e2f98905dd4
+  revision: 42510bf71472e2e35d9becb546edd05562672344
   specs:
     arel (9.0.0.alpha)
 
@@ -117,23 +111,21 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     amq-protocol (2.2.0)
     ast (2.3.0)
-    aws-sdk (2.10.19)
-      aws-sdk-resources (= 2.10.19)
-    aws-sdk-core (2.10.19)
+    aws-sdk (2.10.27)
+      aws-sdk-resources (= 2.10.27)
+    aws-sdk-core (2.10.27)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.19)
-      aws-sdk-core (= 2.10.19)
+    aws-sdk-resources (2.10.27)
+      aws-sdk-core (= 2.10.27)
     aws-sigv4 (1.0.1)
-    azure-core (0.1.9)
+    azure-core (0.1.10)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
-      nokogiri (~> 1.7)
-    azure-storage (0.11.4.preview)
+    azure-storage (0.12.3.preview)
       azure-core (~> 0.1)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
-      nokogiri (~> 1.6)
     backburner (1.4.1)
       beaneater (~> 1.0)
       concurrent-ruby (~> 1.0.1)
@@ -156,7 +148,7 @@ GEM
       thor (~> 0.19.1)
       useragent (~> 0.16.7)
     blade-qunit_adapter (2.0.1)
-    blade-sauce_labs_plugin (0.7.1)
+    blade-sauce_labs_plugin (0.7.2)
       childprocess
       faraday
       selenium-webdriver
@@ -166,9 +158,9 @@ GEM
     bunny (2.6.6)
       amq-protocol (>= 2.1.0)
     byebug (9.0.6)
-    capybara (2.14.4)
+    capybara (2.15.1)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
@@ -213,13 +205,13 @@ GEM
     et-orbi (1.0.5)
       tzinfo
     event_emitter (0.2.6)
-    eventmachine (1.2.3)
-    eventmachine (1.2.3-x64-mingw32)
-    eventmachine (1.2.3-x86-mingw32)
+    eventmachine (1.2.5)
+    eventmachine (1.2.5-x64-mingw32)
+    eventmachine (1.2.5-x86-mingw32)
     execjs (2.7.0)
-    faraday (0.12.2)
+    faraday (0.13.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.0)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     faye (1.2.4)
       cookiejar (>= 0.3.0)
@@ -249,7 +241,7 @@ GEM
       googleauth (~> 0.5.1)
     google-cloud-env (1.0.1)
       faraday (~> 0.11)
-    google-cloud-storage (1.3.0)
+    google-cloud-storage (1.4.0)
       digest-crc (~> 0.4)
       google-api-client (~> 0.13.0)
       google-cloud-core (~> 1.0)
@@ -295,8 +287,9 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.8.0)
+    mini_mime (0.1.4)
     mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     minitest-bisect (1.4.0)
       minitest-server (~> 1.0)
       path_expander (~> 1.0)
@@ -312,9 +305,9 @@ GEM
     multipart-post (2.0.0)
     mustache (1.0.5)
     mustermann (1.0.0)
-    mysql2 (0.4.8)
-    mysql2 (0.4.8-x64-mingw32)
-    mysql2 (0.4.8-x86-mingw32)
+    mysql2 (0.4.9)
+    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)
@@ -323,10 +316,10 @@ GEM
     nokogiri (1.8.0-x86-mingw32)
       mini_portile2 (~> 2.2.0)
     os (0.9.6)
-    parallel (1.11.2)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    path_expander (1.0.1)
+    path_expander (1.0.2)
     pg (0.19.0)
     pg (0.19.0-x64-mingw32)
     pg (0.19.0-x86-mingw32)
@@ -340,7 +333,7 @@ GEM
       qu (= 0.2.0)
       redis-namespace
       simple_uuid
-    que (0.13.1)
+    que (0.14.0)
     racc (1.4.14)
     rack (2.0.3)
     rack-cache (1.7.0)
@@ -398,10 +391,10 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
     sdoc (1.0.0.rc2)
       rdoc (~> 5.0)
-    selenium-webdriver (3.4.4)
+    selenium-webdriver (3.5.1)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-    sequel (4.48.0)
+    sequel (4.49.0)
     serverengine (1.5.11)
       sigdump (~> 0.2.2)
     sidekiq (5.0.4)
@@ -444,6 +437,7 @@ 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.6)
     tilt (2.0.8)
@@ -535,7 +529,6 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
   stackprof
   sucker_punch
-  thor!
   turbolinks (~> 5)
   tzinfo-data
   uglifier (>= 1.3.0)