Merge branch 'master' into dependabot/bundler/capybara-3.15.0

Gemfile.lock

@@ -104,13 +104,13 @@ GEM
     minitest (5.11.3)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    parallel (1.13.0)
-    parser (2.6.0.0)
+    parallel (1.15.0)
+    parser (2.6.2.0)
       ast (~> 2.4.0)
     pi_piper (2.0.0)
       eventmachine (= 1.0.9)
       ffi
-    powerpack (0.1.2)
+    psych (3.1.0)
     public_suffix (3.0.3)
     puma (3.12.1)
     quiet_assets (1.1.0)
@@ -166,14 +166,14 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.64.0)
+    rubocop (0.66.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
     ruby-progressbar (1.10.0)
     rubyzip (1.2.2)
     selenium-webdriver (3.12.0)
@@ -206,7 +206,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)