résolution conflit

[gestion-adh.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index b9bb2acbf685afc030e4a1b8858c5aafed607933..742e6fa779406ab2f6e9d77ee290ecdda48db164 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,56 +4,110 @@ PATH
     nos_oignons (0.0.1.dev)
       mail
       prawn
+      rest-client
       safe_yaml
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.14.2)
-      childprocess (~> 0.5.6)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
-      ffi (~> 1.9.10)
-      rspec-expectations (>= 2.99)
-      thor (~> 0.19)
-    builder (3.2.3)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    contracts (0.16.0)
-    cucumber (2.4.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 1.5.0)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 4.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (1.5.0)
-      gherkin (~> 4.0)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.3)
-    ffi (1.9.18)
-    gherkin (4.1.3)
-    json (2.1.0)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.1)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    aruba (2.1.0)
+      bundler (>= 1.17, < 3.0)
+      childprocess (>= 2.0, < 5.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 4.0, < 9.0)
+      rspec-expectations (~> 3.4)
+      thor (~> 1.0)
+    builder (3.2.4)
+    childprocess (4.1.0)
+    contracts (0.16.1)
+    crack (0.4.5)
+      rexml
+    cucumber (8.0.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-ci-environment (~> 9.0, >= 9.0.4)
+      cucumber-core (~> 11.0, >= 11.0.0)
+      cucumber-cucumber-expressions (~> 15.1, >= 15.1.1)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-html-formatter (~> 19.1, >= 19.1.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      diff-lcs (~> 1.5, >= 1.5.0)
+      mime-types (~> 3.4, >= 3.4.1)
+      multi_test (~> 1.1, >= 1.1.0)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-ci-environment (9.1.0)
+    cucumber-core (11.0.0)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
+    cucumber-cucumber-expressions (15.2.0)
+    cucumber-gherkin (23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-html-formatter (19.2.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-messages (18.0.0)
+    cucumber-tag-expressions (4.1.0)
+    date (3.3.3)
+    diff-lcs (1.5.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.15.5)
+    hashdiff (1.0.1)
+    http-accept (1.7.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    json (2.6.2)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    matrix (0.4.2)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    multi_json (1.12.2)
-    multi_test (0.1.2)
-    pdf-core (0.7.0)
-    prawn (2.2.2)
-      pdf-core (~> 0.7.0)
-      ttfunk (~> 1.5)
-    rspec-expectations (3.6.0)
+    mime-types-data (3.2022.0105)
+    mini_mime (1.1.2)
+    multi_test (1.1.0)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    netrc (0.11.0)
+    pdf-core (0.9.0)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
+    public_suffix (5.0.1)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rexml (3.2.5)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    safe_yaml (1.0.4)
-    thor (0.20.0)
-    timecop (0.9.1)
-    ttfunk (1.5.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    safe_yaml (1.0.5)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+    thor (1.2.1)
+    timecop (0.9.5)
+    timeout (0.3.2)
+    ttfunk (1.7.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -62,8 +116,10 @@ DEPENDENCIES
   aruba
   cucumber
   json
+  matrix (~> 0.4.2)
   nos_oignons!
   timecop
+  webmock
 
 BUNDLED WITH
-   1.13.6
+   2.2.5