Merge branch 'master' into dependabot/bundler/nokogiri-1.10.3

digitaltom · May 6, 2019 · edbe4bc · edbe4bc
2 parents 938df87 + e8ca925
commit edbe4bc
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -104,13 +104,12 @@ GEM
     minitest (5.11.3)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    parallel (1.15.0)
-    parser (2.6.2.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pi_piper (2.0.0)
       eventmachine (= 1.0.9)
       ffi
-    psych (3.1.0)
     public_suffix (3.0.3)
     puma (3.12.1)
     quiet_assets (1.1.0)
@@ -166,11 +165,10 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.66.0)
+    rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)