From 3c24138dca32f5f3474df17b87474afa0abbb278 Mon Sep 17 00:00:00 2001 From: Ferdinando Primerano Date: Tue, 7 Jan 2020 09:12:22 +0000 Subject: [PATCH] Update rails and comfy CMS gems --- Gemfile | 6 +- Gemfile.lock | 215 ++++++++++++++++++++++++--------------------------- 2 files changed, 106 insertions(+), 115 deletions(-) diff --git a/Gemfile b/Gemfile index 481c40562..6c466d709 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' -gem 'rails', '5.0.5' +gem 'rails', '5.2.0' gem 'webpacker', '~> 4.0.2' gem 'pg', '~> 0.21' -gem 'activerecord-postgis-adapter', '4.1.0' +gem 'activerecord-postgis-adapter', '5.1.0' gem 'dbf', '~> 2.0.7' # gem 'elasticsearch', '~> 7.2.0' @@ -102,7 +102,7 @@ gem 'bystander', '2.0.0', git: 'https://github.com/unepwcmc/bystander' gem 'devise', '~> 4.7.1' # MAJOR VERSION CHANGE, CHECK DOCS -gem 'comfortable_mexican_sofa', '1.12.10' +gem 'comfortable_mexican_sofa', '~> 2.0.0' gem 'nokogiri', '~> 1.10.4' gem 'tinymce-rails', '~> 4.3.2' gem 'phantompdf', '~> 1.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index b48748051..bef8a4066 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,58 +8,62 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.0.5) - actionpack (= 5.0.5) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.5) - actionview (= 5.0.5) - activesupport (= 5.0.5) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.5) - activesupport (= 5.0.5) + actionview (5.2.0) + activesupport (= 5.2.0) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) active_link_to (1.0.5) actionpack addressable - activejob (5.0.5) - activesupport (= 5.0.5) + activejob (5.2.0) + activesupport (= 5.2.0) globalid (>= 0.3.6) - activemodel (5.0.5) - activesupport (= 5.0.5) - activerecord (5.0.5) - activemodel (= 5.0.5) - activesupport (= 5.0.5) - arel (~> 7.0) - activerecord-postgis-adapter (4.1.0) - activerecord (~> 5.0.0) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activerecord-postgis-adapter (5.1.0) + activerecord (~> 5.1) rgeo-activerecord (~> 6.0) - activesupport (5.0.5) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) airbrussh (1.3.2) sshkit (>= 1.6.1, != 1.7.0) appsignal (1.3.6) rack thread_safe - arel (7.1.4) - autoprefixer-rails (9.4.10.2) + arel (9.0.0) + autoprefixer-rails (9.7.3) execjs aws-eventstream (1.0.2) aws-partitions (1.144.0) @@ -767,13 +771,7 @@ GEM best_in_place (3.0.3) actionpack (>= 3.2) railties (>= 3.2) - bootstrap-sass (3.4.1) - autoprefixer-rails (>= 5.2.1) - sassc (>= 2.0.0) - bootstrap_form (4.2.0) - actionpack (>= 5.0) - activemodel (>= 5.0) - builder (3.2.3) + builder (3.2.4) byebug (9.1.0) capistrano (3.11.0) airbrussh (>= 1.0.0) @@ -808,9 +806,6 @@ GEM childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) - climate_control (0.2.0) - codemirror-rails (5.16.0) - railties (>= 3.0, < 6.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -818,21 +813,19 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - comfortable_mexican_sofa (1.12.10) + comfortable_mexican_sofa (2.0.19) active_link_to (>= 1.0.0) - bootstrap-sass (>= 3.2.0) - bootstrap_form (>= 2.2.0) - codemirror-rails (>= 3.0.0) - coffee-rails (>= 3.1.0) - haml-rails (>= 0.3.0) - jquery-rails (>= 3.0.0) - jquery-ui-rails (>= 5.0.0) + comfy_bootstrap_form (>= 4.0.0) + haml-rails (>= 1.0.0) + jquery-rails (>= 4.3.1) kramdown (>= 1.0.0) - paperclip (>= 4.0.0) - plupload-rails (>= 1.2.1) - rails (>= 4.0.0, < 5.1) - rails-i18n (>= 4.0.0) - sass-rails (>= 4.0.3) + mimemagic (>= 0.3.2) + mini_magick (>= 4.8.0) + rails (>= 5.2.0) + rails-i18n (>= 5.0.0) + sassc-rails (>= 2.0.0) + comfy_bootstrap_form (4.0.8) + rails (>= 5.0.0) concurrent-ruby (1.1.5) connection_pool (2.2.2) crack (0.4.3) @@ -863,6 +856,7 @@ GEM elasticsearch-transport (7.2.1) faraday multi_json + erubi (1.9.0) erubis (2.7.0) exception_notification (4.3.0) actionmailer (>= 4.0, < 6) @@ -876,19 +870,19 @@ GEM faraday (0.15.4) multipart-post (>= 1.2, < 3) fastercsv (1.5.5) - ffi (1.10.0) + ffi (1.11.3) gdal (2.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - haml (5.0.4) + haml (5.1.2) temple (>= 0.8.0) tilt - haml-rails (1.0.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) + haml-rails (2.0.1) + actionpack (>= 5.1) + activesupport (>= 5.1) haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) - railties (>= 4.0.1) + railties (>= 5.1) hashdiff (0.3.8) html2haml (2.2.0) erubis (~> 2.7.0) @@ -902,32 +896,33 @@ GEM multipart-post httparty (0.15.7) multi_xml (>= 0.5.2) - i18n (0.9.5) + i18n (1.7.0) concurrent-ruby (~> 1.0) jmespath (1.4.0) - jquery-rails (4.3.3) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) - railties (>= 3.2.16) json (2.2.0) kramdown (2.1.0) levenshtein (0.2.2) - loofah (2.3.1) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) metaclass (0.0.4) method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) mimemagic (0.3.3) - mini_mime (1.0.1) + mini_magick (4.10.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.13.0) mocha (1.0.0) metaclass (~> 0.0.1) multi_json (1.13.1) @@ -937,24 +932,16 @@ GEM net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) - nio4r (2.3.1) - nokogiri (1.10.4) + nio4r (2.5.2) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - paperclip (6.1.0) - activemodel (>= 4.2.0) - activesupport (>= 4.2.0) - mime-types - mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) pg (0.21.0) phantomjs (2.1.1.0) phantompdf (1.2.2) json phantomjs rack - plupload-rails (1.2.1) - rails (>= 3.1) premailer (1.11.1) addressable css_parser (>= 1.6.0) @@ -962,7 +949,7 @@ GEM premailer-rails (1.10.2) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - public_suffix (3.0.3) + public_suffix (4.0.3) rack (2.0.8) rack-accept (0.4.5) rack (>= 0.4) @@ -972,19 +959,20 @@ GEM rack rack-proxy (0.6.5) rack - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.5) - actioncable (= 5.0.5) - actionmailer (= 5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) - activemodel (= 5.0.5) - activerecord (= 5.0.5) - activesupport (= 5.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) bundler (>= 1.3.0) - railties (= 5.0.5) + railties (= 5.2.0) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -998,15 +986,15 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.0.5) - actionpack (= 5.0.5) - activesupport (= 5.0.5) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (13.0.0) + rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) redis (4.1.0) responders (3.0.0) @@ -1016,28 +1004,33 @@ GEM rgeo-activerecord (6.2.1) activerecord (>= 5.0) rgeo (>= 1.0.0) - ruby_parser (3.13.0) + ruby_parser (3.14.1) sexp_processor (~> 4.9) rubyzip (1.3.0) safe_yaml (1.0.5) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) + sass-rails (5.0.8) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.0.1) + sassc (2.2.1) ffi (~> 1.9) - rake + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) - sexp_processor (4.12.0) + sexp_processor (4.13.0) sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) rack (>= 1.5.0) @@ -1072,12 +1065,10 @@ GEM net-ssh (>= 2.8.0) system (0.1.3) version (~> 1.0.0) - temple (0.8.1) - terrapin (0.6.0) - climate_control (>= 0.0.3, < 1.0) - thor (0.20.3) + temple (0.8.2) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.9) + tilt (2.0.10) timecop (0.7.4) tinymce-rails (4.3.13) railties (>= 3.1.1) @@ -1086,7 +1077,7 @@ GEM rack (>= 1.3, < 3) rack-accept (~> 0.4) tilt (>= 1.4, < 3) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -1103,7 +1094,7 @@ GEM activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - websocket-driver (0.6.5) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) whenever (0.10.0) @@ -1116,7 +1107,7 @@ PLATFORMS ruby DEPENDENCIES - activerecord-postgis-adapter (= 4.1.0) + activerecord-postgis-adapter (= 5.1.0) appsignal (~> 1.3.6) autoprefixer-rails aws-sdk (= 3.0.1) @@ -1134,7 +1125,7 @@ DEPENDENCIES capistrano-sidekiq (= 1.0.2) capybara (~> 2.3.0) coffee-rails (~> 4.2.2) - comfortable_mexican_sofa (= 1.12.10) + comfortable_mexican_sofa (~> 2.0.0) dalli (~> 2.7.2) database_cleaner dbf (~> 2.0.7) @@ -1157,7 +1148,7 @@ DEPENDENCIES phantompdf (~> 1.2.2) premailer-rails rack-cache (~> 1.2) - rails (= 5.0.5) + rails (= 5.2.0) rails-controller-testing sass-rails (~> 5.0.7) selenium-webdriver