From 046ed9f7b700bb3830bfe57bf4a828ab75a13bea Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Mon, 28 Sep 2020 22:58:24 +0200 Subject: [PATCH 1/6] Update codecov dependency to latest 0.2.11 The used version 0.1.14 was yanked from rubygems.org --- Gemfile.lock | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 27ec514a..56878bbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,10 +124,9 @@ GEM aws_cf_signer rest-client cocoon (1.2.14) - codecov (0.1.14) + codecov (0.2.11) json simplecov - url coderay (1.1.1) concurrent-ruby (1.1.5) connection_pool (2.2.2) @@ -161,7 +160,7 @@ GEM devise_ichain_authenticatable (0.3.2) devise (>= 2.2) diff-lcs (1.3) - docile (1.3.1) + docile (1.3.2) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) @@ -254,7 +253,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (2.3.0) + json (2.3.1) json-schema (2.8.1) addressable (>= 2.4) jsonapi-renderer (0.2.2) @@ -529,11 +528,10 @@ GEM shellany (0.0.1) shoulda-matchers (4.1.2) activesupport (>= 4.2.0) - simplecov (0.16.1) + simplecov (0.19.0) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov-html (0.12.3) sixarm_ruby_unaccent (1.2.0) skylight (3.1.5) skylight-core (= 3.1.5) @@ -584,7 +582,6 @@ GEM unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties - url (0.3.2) warden (1.2.8) rack (>= 2.0.6) web-console (3.7.0) From f5ac859b9b12b782726e0934e1dac677816ce5c7 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 29 Sep 2020 00:02:18 +0200 Subject: [PATCH 2/6] The "chromeOptions" key in chrome capabilities changed to "goog:chromeOptions". But I'm rather switching to the 'option' array here for readability and alignment with Firefox options. --- spec/spec_helper.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fe6bab9b..a68412da 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -78,12 +78,12 @@ RSpec.configure do |config| end Capybara.register_driver :chrome_headless do |app| - capabilities = Selenium::WebDriver::Remote::Capabilities.chrome( - chromeOptions: { args: %w(headless disable-gpu window-size=1920x1080 no-sandbox) } - ) - Capybara::Selenium::Driver.new( - app, browser: :chrome, desired_capabilities: capabilities - ) + options = ::Selenium::WebDriver::Chrome::Options.new + options.args << '--window-size=1920x1080' + options.args << '--headless' + options.args << '--no-sandbox' + options.args << '--disable-gpu' + Capybara::Selenium::Driver.new(app, browser: :chrome, options: options) end Capybara.default_max_wait_time = 10 # seconds From bfb036fa96ec63f320af98ef4c389834ad2598c8 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 29 Sep 2020 00:15:42 +0200 Subject: [PATCH 3/6] upgrade rails to 5.2.4.4 --- Gemfile | 2 +- Gemfile.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Gemfile b/Gemfile index b281e1aa..27758cae 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') end # as web framework -gem 'rails', '~> 5.2.3' +gem 'rails', '~> 5.2' # Use Puma as the app server gem 'puma', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 56878bbf..77892e96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,25 +13,25 @@ GEM remote: https://rails-assets.org/ specs: Ascii85 (1.0.3) - actioncable (5.2.3) - actionpack (= 5.2.3) + actioncable (5.2.4.4) + actionpack (= 5.2.4.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) + actionmailer (5.2.4.4) + actionpack (= 5.2.4.4) + actionview (= 5.2.4.4) + activejob (= 5.2.4.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) - rack (~> 2.0) + actionpack (5.2.4.4) + actionview (= 5.2.4.4) + activesupport (= 5.2.4.4) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) + actionview (5.2.4.4) + activesupport (= 5.2.4.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -41,20 +41,20 @@ GEM activemodel (>= 4.1, < 6.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.2.3) - activesupport (= 5.2.3) + activejob (5.2.4.4) + activesupport (= 5.2.4.4) globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) + activemodel (5.2.4.4) + activesupport (= 5.2.4.4) + activerecord (5.2.4.4) + activemodel (= 5.2.4.4) + activesupport (= 5.2.4.4) arel (>= 9.0) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) + activestorage (5.2.4.4) + actionpack (= 5.2.4.4) + activerecord (= 5.2.4.4) marcel (~> 0.3.1) - activesupport (5.2.3) + activesupport (5.2.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -94,7 +94,7 @@ GEM bootstrap-switch-rails (3.0.2) bootstrap3-datetimepicker-rails (4.17.47) momentjs-rails (>= 2.8.1) - builder (3.2.3) + builder (3.2.4) byebug (11.0.1) cancancan (2.3.0) capybara (3.26.0) @@ -128,7 +128,7 @@ GEM json simplecov coderay (1.1.1) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.7) connection_pool (2.2.2) countable-rails (0.0.1) railties (>= 3.1) @@ -141,7 +141,7 @@ GEM sort_alphabetical (~> 1.0) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) + crass (1.0.6) daemons (1.3.1) dalli (2.7.10) dante (0.2.0) @@ -234,7 +234,7 @@ GEM htmlentities (4.3.4) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.7.0) + i18n (1.8.5) concurrent-ruby (~> 1.0) i18n_data (0.8.0) inversion (1.1.1) @@ -269,7 +269,7 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) loggability (0.14.0) - loofah (2.4.0) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.12) @@ -281,14 +281,14 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mimemagic (0.3.3) + mimemagic (0.3.5) mina (1.2.3) open4 (~> 1.3.4) rake mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.2) momentjs-rails (2.20.1) railties (>= 3.1) monetize (1.9.2) @@ -308,8 +308,8 @@ GEM net-http-persistent (3.0.1) connection_pool (~> 2.2) netrc (0.11.0) - nio4r (2.5.2) - nokogiri (1.10.8) + nio4r (2.5.4) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) @@ -378,24 +378,24 @@ GEM slop (~> 3.4) public_suffix (3.1.1) puma (3.12.6) - rack (2.1.4) + rack (2.2.3) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) + rails (5.2.4.4) + actioncable (= 5.2.4.4) + actionmailer (= 5.2.4.4) + actionpack (= 5.2.4.4) + actionview (= 5.2.4.4) + activejob (= 5.2.4.4) + activemodel (= 5.2.4.4) + activerecord (= 5.2.4.4) + activestorage (= 5.2.4.4) + activesupport (= 5.2.4.4) bundler (>= 1.3.0) - railties (= 5.2.3) + railties (= 5.2.4.4) sprockets-rails (>= 2.0.0) rails-assets-bootstrap (3.3.6) rails-assets-jquery (>= 1.9.1, < 3) @@ -429,9 +429,9 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) + railties (5.2.4.4) + actionpack (= 5.2.4.4) + activesupport (= 5.2.4.4) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -546,7 +546,7 @@ GEM 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) @@ -560,7 +560,7 @@ GEM stripe (>= 2.0.3) sysexits (1.2.0) temple (0.8.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tilt (2.0.9) timecop (0.9.1) @@ -571,7 +571,7 @@ GEM turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) @@ -597,7 +597,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket-driver (0.7.1) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) whenever (0.10.0) @@ -676,7 +676,7 @@ DEPENDENCIES prawn-qrcode prawn-rails puma (~> 3.0) - rails (~> 5.2.3) + rails (~> 5.2) rails-assets-bootstrap-markdown! rails-assets-bootstrap-select! rails-assets-date.format! From 7d0297410e7c2179f911d10d2f5734dbfed5ea6f Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 29 Sep 2020 00:29:14 +0200 Subject: [PATCH 4/6] update chartkick dep --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 77892e96..a360fcb1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,7 +115,7 @@ GEM fastimage case_transform (0.2) activesupport - chartkick (3.3.0) + chartkick (3.4.0) childprocess (3.0.0) chronic (0.10.2) chunky_png (1.3.11) From 588884bace172ebc4afdcdc5b5f723692b7201f4 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 29 Sep 2020 00:32:22 +0200 Subject: [PATCH 5/6] update jquery-ui-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- app/assets/javascripts/application.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 27758cae..4c4873cb 100644 --- a/Gemfile +++ b/Gemfile @@ -82,7 +82,7 @@ gem 'formtastic-bootstrap' # as the JavaScript library gem 'jquery-rails' -gem 'jquery-ui-rails', '~> 4.2.1' +gem 'jquery-ui-rails', '~> 6.0.1' # for languages validation gem 'iso-639' diff --git a/Gemfile.lock b/Gemfile.lock index a360fcb1..1817e18b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -251,7 +251,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.3.1) json-schema (2.8.1) @@ -655,7 +655,7 @@ DEPENDENCIES iso-639 jquery-datatables-rails jquery-rails - jquery-ui-rails (~> 4.2.1) + jquery-ui-rails (~> 6.0.1) json-schema leaflet-rails letter_opener diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index da958dc3..9917612b 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,8 +13,8 @@ //= require jquery //= require jquery_ujs //= require jquery.mobile.custom.min -//= require jquery.ui.draggable -//= require jquery.ui.droppable +//= require jquery-ui/widgets/draggable +//= require jquery-ui/widgets/droppable //= require waypoints/jquery.waypoints //= require dataTables/jquery.dataTables //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap From d097f1b29f563e4803ce782b030440a1a50e531b Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Wed, 28 Oct 2020 23:32:32 +0100 Subject: [PATCH 6/6] update awesome_nested_set --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1817e18b..4fd47a6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,8 +80,8 @@ GEM ast (2.4.0) autoprefixer-rails (9.6.4) execjs - awesome_nested_set (3.1.4) - activerecord (>= 4.0.0, < 5.3) + awesome_nested_set (3.2.1) + activerecord (>= 4.0.0, < 7.0) aws_cf_signer (0.1.3) axlsx_rails (0.5.2) actionpack (>= 3.1)