From 95fd6083bf602c73afe48f4eac0cc801be0391e8 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sat, 15 May 2021 17:31:04 +0200 Subject: [PATCH] suite --- Gemfile | 8 +- Gemfile.lock | 335 ++++++++++++++++++++++++++------------------------- 2 files changed, 170 insertions(+), 173 deletions(-) diff --git a/Gemfile b/Gemfile index a558141..94e0634 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' gem 'rails', '4.2.10' -gem "mysql2" +gem "mysql2", "0.4.10" gem 'sass-rails', '5.0.6' @@ -36,12 +36,6 @@ group :development, :test do #gem 'capistrano-rails' #gem "rvm-capistrano" - gem "capistrano", '2.15.9', group: :development, require: false - gem "rvm-capistrano",'1.4.1', group: :development - #gem 'net-ssh', '~>2.7.0' - #gem 'net-sftp' - - gem 'net-ssh', '~> 5.1.0' #gem 'openssl', '~> 2.0.0.beta.1' diff --git a/Gemfile.lock b/Gemfile.lock index 7feb530..bfdf6e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,176 +36,182 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) acts_as_commentable (4.0.2) - acts_as_tree (2.1.0) + acts_as_tree (2.9.1) activerecord (>= 3.0.0) - addressable (2.4.0) arel (6.0.4) - bcrypt (3.1.10) - binding_of_caller (0.7.2) + bcrypt (3.1.16) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - builder (3.2.3) - byebug (3.5.1) - columnize (~> 0.8) - debugger-linecache (~> 1.2) - slop (~> 3.6) - capistrano (2.15.9) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.1.0) - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + builder (3.2.4) + byebug (11.1.3) + carrierwave (1.3.2) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) + ssrf_filter (~> 1.0) chronic (0.10.2) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) - columnize (0.9.0) - commander (4.4.6) - highline (~> 1.7.2) - concurrent-ruby (1.1.3) - countries (1.2.2) - currencies (~> 0.4.2) - i18n_data (~> 0.7.0) - country_select (2.5.1) - countries (~> 1.2.0) + coffee-script-source (1.12.2) + commander (4.6.0) + highline (~> 2.0.0) + commonjs (0.2.7) + concurrent-ruby (1.1.8) + countries (3.1.0) + i18n_data (~> 0.11.0) + sixarm_ruby_unaccent (~> 1.1) + unicode_utils (~> 1.4) + country_select (4.0.0) + countries (~> 3.0) sort_alphabetical (~> 1.0) - crass (1.0.4) + crass (1.0.6) curb (0.9.10) - currencies (0.4.2) - debug_inspector (0.0.2) - debugger-linecache (1.2.0) + debug_inspector (1.1.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - elasticsearch (6.0.1) - elasticsearch-api (= 6.0.1) - elasticsearch-transport (= 6.0.1) - elasticsearch-api (6.0.1) + elasticsearch (7.12.0) + elasticsearch-api (= 7.12.0) + elasticsearch-transport (= 7.12.0) + elasticsearch-api (7.12.0) multi_json - elasticsearch-transport (6.0.1) - faraday + elasticsearch-transport (7.12.0) + faraday (~> 1) multi_json erubis (2.7.0) - execjs (2.3.0) - faraday (0.12.2) + execjs (2.8.1) + faraday (1.4.1) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - fastimage (1.8.1) - addressable (~> 2.3, >= 2.3.5) - ffi (1.9.25) + ruby2_keywords (>= 0.0.4) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) + fastimage (2.2.3) + ffi (1.15.0) formtastic (2.3.0) actionpack (>= 3.0) formtastic-bootstrap (3.0.0) formtastic (>= 2.2) - geocoder (1.2.9) - gibbon (3.1.1) - faraday (>= 0.9.1) + geocoder (1.6.7) + gibbon (3.4.0) + faraday (>= 0.16.0) multi_json (>= 1.11.0) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) gravatar_image_tag (1.2.0) - haml (4.0.6) + haml (5.2.1) + temple (>= 0.8.0) tilt - haml-rails (0.8.2) + haml-rails (1.0.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 3.1, < 5.0) + haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashie (3.5.7) - highline (1.7.8) + hashie (4.1.0) + highline (2.0.3) houston (2.4.0) commander (~> 4.4) json - html2haml (2.0.0) + html2haml (2.2.0) erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) ruby_parser (~> 3.5) http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n_data (0.7.0) + i18n_data (0.11.0) iban-tools (1.1.0) - jbuilder (2.2.8) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) - jquery-rails (4.0.3) - rails-dom-testing (~> 1.0) + idn-ruby (0.1.0) + jbuilder (2.9.1) + activesupport (>= 4.2.0) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - jwt (1.5.6) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + jwt (2.2.3) + kaminari (1.2.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) + actionview + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) + activerecord + kaminari-core (= 1.2.1) kaminari-bootstrap (3.0.1) kaminari (>= 0.13.0) rails - kgio (2.9.3) - libv8 (3.16.14.7) - loofah (2.2.3) + kaminari-core (1.2.1) + kgio (2.11.3) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (4.0.0) + actionpack (>= 4) + less (~> 2.6.0) + sprockets (>= 2) + libv8 (3.16.14.19) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) - mailjet (1.5.4) + mailjet (1.6.0) activesupport (>= 3.1.0) rack (>= 1.4.0) - rest-client - mime-types (3.2.2) + rest-client (>= 2.0.0) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mini_mime (1.0.1) - mini_portile2 (2.1.0) - minitest (5.11.3) - multi_json (1.13.1) + mime-types-data (3.2021.0225) + mini_mime (1.1.0) + mini_portile2 (2.4.0) + minitest (5.14.4) + multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) mysql2 (0.4.10) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (5.1.0) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) netrc (0.11.0) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + oauth2 (1.4.7) + faraday (>= 0.8, < 2.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) ogone-rails (0.1.10) activesupport - omniauth (1.6.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (2.0.4) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - omniauth-facebook (4.0.0) + rack-protection + omniauth-facebook (8.0.0) omniauth-oauth2 (~> 1.2) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) - omniauth (~> 1.2) + omniauth-oauth2 (1.7.1) + oauth2 (~> 1.4) + omniauth (>= 1.9, < 3) paypal-sdk-core (0.3.4) multi_json (~> 1.0) xml-simple paypal-sdk-merchant (1.117.2) paypal-sdk-core (~> 0.3.0) - posix-spawn (0.3.13) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) - rack (1.6.11) + posix-spawn (0.3.15) + pygments.rb (2.2.0) + rack (1.6.13) + rack-protection (2.1.0) + rack rack-test (0.6.3) rack (>= 1.0) rails (4.2.10) @@ -219,14 +225,14 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.10) sprockets-rails - rails-deprecated_sanitizer (1.0.3) + rails-deprecated_sanitizer (1.0.4) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails_autolink (1.1.6) rails (> 3.1) railties (4.2.10) @@ -234,35 +240,33 @@ GEM activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.13.0) - rake (12.3.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rdoc (4.2.0) - json (~> 1.4) - redcarpet (3.3.4) - ref (1.0.5) + raindrops (0.19.1) + rake (13.0.3) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) + ffi (~> 1.0) + rdoc (4.3.0) + redcarpet (3.5.1) + ref (2.0.0) 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) - rmagick (2.15.4) + rmagick (4.2.2) roo (2.1.1) nokogiri (~> 1) rubyzip (~> 1.1, < 2.0.0) - roo-xls (1.0.0) + roo-xls (1.2.0) nokogiri - roo (>= 2.0.0beta1, < 3) + roo (>= 2.0.0, < 3) spreadsheet (> 0.9.0) - ruby-ole (1.2.11.8) - ruby_parser (3.6.4) - sexp_processor (~> 4.1) - rubyzip (1.1.7) - rvm-capistrano (1.4.1) - capistrano (>= 2.0.0) - sass (3.7.2) + ruby-ole (1.2.12.2) + ruby2_keywords (0.0.4) + ruby_parser (3.15.1) + sexp_processor (~> 4.9) + rubyzip (1.3.0) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -273,66 +277,68 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - searchkick (2.4.0) - activemodel (>= 4.1) - elasticsearch (>= 1) + searchkick (3.1.3) + activemodel (>= 4.2) + elasticsearch (>= 5) hashie - sexp_processor (4.4.5) - slop (3.6.0) - sort_alphabetical (1.0.2) + sexp_processor (4.15.2) + sixarm_ruby_unaccent (1.2.0) + sort_alphabetical (1.1.0) unicode_utils (>= 1.2.2) - spreadsheet (1.0.9) - ruby-ole (>= 1.0) - spring (1.3.2) + spreadsheet (1.2.8) + ruby-ole + spring (2.1.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) + ssrf_filter (1.0.7) + temple (0.8.2) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref - thor (0.20.3) + thor (1.1.0) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.10) truncate_html (0.9.3) - turbolinks (2.5.3) - coffee-rails - twitter-bootstrap-rails (3.2.0) - actionpack (~> 4.1) - execjs (~> 2.2) - rails (~> 4.1) - railties (~> 4.1) - twitter-text (1.13.4) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + twitter-bootstrap-rails (3.2.2) + actionpack (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) + railties (>= 3.1) + twitter-text (3.1.0) + idn-ruby unf (~> 0.1.0) - tzinfo (1.2.5) + tzinfo (1.2.9) thread_safe (~> 0.1) - uglifier (2.7.0) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.7) unicode_utils (1.4.0) - unicorn (4.8.3) + unicorn (6.0.0) kgio (~> 2.6) - rack raindrops (~> 0.7) - web-console (2.0.0) - activemodel (~> 4.0) + web-console (2.3.0) + activemodel (>= 4.0) binding_of_caller (>= 0.7.2) - railties (~> 4.0) + railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) whenever (1.0.0) chronic (>= 0.6.3) - wicked_pdf (0.11.0) - rails - xml-simple (1.1.5) + wicked_pdf (2.1.0) + activesupport + xml-simple (1.1.8) PLATFORMS ruby @@ -342,7 +348,6 @@ DEPENDENCIES acts_as_tree bcrypt (~> 3.1.7) byebug - capistrano (= 2.15.9) carrierwave coffee-rails (~> 4.1.0) country_select @@ -360,8 +365,7 @@ DEPENDENCIES jquery-rails kaminari-bootstrap mailjet - mysql2 - net-ssh (~> 5.1.0) + mysql2 (= 0.4.10) nokogiri ogone-rails omniauth-facebook @@ -374,7 +378,6 @@ DEPENDENCIES rmagick roo (~> 2.1.0) roo-xls - rvm-capistrano (= 1.4.1) sass-rails (= 5.0.6) sdoc (~> 0.4.0) searchkick