nominatim: add website setup to merge hook

[chef.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 75ce490435240fd6a7ceefa47ba15543e16adc49..e514b7ecb50f8b1ef0a0838b939c7b57d35dd980 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)
-    cookstyle (5.21.9)
-      rubocop (= 0.75.1)
+    cookstyle (6.9.0)
+      rubocop (= 0.86.0)
     diff-lcs (1.3)
     docker-api (1.34.2)
       excon (>= 0.47.0)
@@ -13,19 +13,18 @@ GEM
     ed25519 (1.2.4)
     equatable (0.6.1)
     erubi (1.9.0)
-    excon (0.72.0)
-    ffi (1.12.2)
+    excon (0.73.0)
+    ffi (1.13.1)
     gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     httpclient (2.8.3)
-    jaro_winkler (1.5.4)
-    kitchen-dokken (2.8.1)
+    kitchen-dokken (2.9.0)
       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (>= 1.15, < 3)
-    license-acceptance (1.0.13)
+    license-acceptance (1.0.19)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
@@ -35,7 +34,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mixlib-install (3.11.26)
+    mixlib-install (3.12.1)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -43,27 +42,29 @@ GEM
     mixlib-versioning (1.2.12)
     multi_json (1.14.1)
     necromancer (0.5.1)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-telnet (0.1.1)
     nori (2.6.0)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
-    pastel (0.7.3)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
     rainbow (3.0.0)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
@@ -72,24 +73,28 @@ GEM
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.75.1)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.86.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (2.2.0)
+    rubyzip (2.3.0)
     serverspec (2.41.5)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)
-    specinfra (2.82.9)
+    specinfra (2.82.16)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -99,28 +104,28 @@ GEM
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (2.3.4)
+    test-kitchen (2.5.2)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)
-      net-scp (>= 1.1, < 3.0)
-      net-ssh (>= 2.9, < 6.0)
+      net-scp (>= 1.1, < 4.0)
+      net-ssh (>= 2.9, < 7.0)
       net-ssh-gateway (>= 1.2, < 3.0)
-      thor (~> 0.19)
+      thor (>= 0.19, < 2.0)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
-    thor (0.20.3)
-    tomlrb (1.2.9)
+    thor (1.0.1)
+    tomlrb (1.3.0)
     tty-box (0.5.0)
       pastel (~> 0.7.2)
       strings (~> 0.1.6)
       tty-cursor (~> 0.7)
     tty-color (0.5.1)
     tty-cursor (0.7.1)
-    tty-prompt (0.20.0)
+    tty-prompt (0.21.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
       tty-reader (~> 0.7.0)
@@ -128,8 +133,8 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.1)
-    unicode-display_width (1.6.1)
+    tty-screen (0.8.0)
+    unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     winrm (2.3.4)
       builder (>= 2.1.2)
@@ -161,4 +166,4 @@ DEPENDENCIES
   test-kitchen
 
 BUNDLED WITH
-   1.17.2
+   2.1.4