From 53e0f80ac5a011ff61b103d0a0509e784b76075b Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 11 Dec 2020 16:22:40 +0100 Subject: [PATCH] move to rails 6.1 and patch awesome_nested_set --- Gemfile | 6 +-- Gemfile.lock | 129 ++++++++++++++++++++++++++------------------------- 2 files changed, 69 insertions(+), 66 deletions(-) diff --git a/Gemfile b/Gemfile index 163764b5cfd..8130d025895 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'actionpack-xml_parser', '~> 2.0.0' gem 'activemodel-serializers-xml', '~> 1.0.1' gem 'activerecord-import', '~> 1.0.2' gem 'activerecord-session_store', '~> 1.1.0' -gem 'rails', '~> 6.0.3.2' +gem 'rails', '~> 6.1.0' gem 'responders', '~> 3.0' gem 'rdoc', '>= 2.4.2' @@ -110,8 +110,8 @@ gem 'multi_json', '~> 1.15.0' gem 'oj', '~> 3.10.2' gem 'daemons' -gem 'delayed_job_active_record', '~> 4.1.4' -gem 'delayed_cron_job', '~> 0.7.2' +gem 'delayed_job_active_record', '~> 4.1.5' +gem 'delayed_cron_job', '~> 0.7.4' gem 'rack-protection', '~> 2.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 5e9d6ee9116..a7186dc9ade 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,57 +183,59 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.3) - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.1.0) + actionpack (= 6.1.0) + activesupport (= 6.1.0) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.1.0) + actionpack (= 6.1.0) + activejob (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.1.0) + actionpack (= 6.1.0) + actionview (= 6.1.0) + activejob (= 6.1.0) + activesupport (= 6.1.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.0) + actionview (= 6.1.0) + activesupport (= 6.1.0) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.1.0) + actionpack (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.1.0) + activesupport (= 6.1.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.1.0) + activesupport (= 6.1.0) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) + activemodel (6.1.0) + activesupport (= 6.1.0) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) + activerecord (6.1.0) + activemodel (= 6.1.0) + activesupport (= 6.1.0) activerecord-import (1.0.7) activerecord (>= 3.2) activerecord-nulldb-adapter (0.5.1) @@ -244,17 +246,19 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 1.5.2, < 3) railties (>= 4.0) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) + activestorage (6.1.0) + actionpack (= 6.1.0) + activejob (= 6.1.0) + activerecord (= 6.1.0) + activesupport (= 6.1.0) marcel (~> 0.3.1) - activesupport (6.0.3.4) + mimemagic (~> 0.3.2) + activesupport (6.1.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) acts_as_list (1.0.3) activerecord (>= 4.2) acts_as_tree (2.9.1) @@ -695,20 +699,20 @@ GEM rack_session_access (0.2.0) builder (>= 2.0.0) rack (>= 1.0.0) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) - bundler (>= 1.3.0) - railties (= 6.0.3.4) + rails (6.1.0) + actioncable (= 6.1.0) + actionmailbox (= 6.1.0) + actionmailer (= 6.1.0) + actionpack (= 6.1.0) + actiontext (= 6.1.0) + actionview (= 6.1.0) + activejob (= 6.1.0) + activemodel (= 6.1.0) + activerecord (= 6.1.0) + activestorage (= 6.1.0) + activesupport (= 6.1.0) + bundler (>= 1.15.0) + railties (= 6.1.0) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -722,12 +726,12 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.1.0) + actionpack (= 6.1.0) + activesupport (= 6.1.0) method_source rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + thor (~> 1.0) rainbow (3.0.0) raindrops (0.19.1) rake (13.0.3) @@ -864,14 +868,13 @@ GEM unicode-display_width (~> 1.1, >= 1.1.1) test-prof (0.12.2) thor (1.0.1) - thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.2) ttfunk (1.7.0) typed_dag (2.0.2) rails (>= 5.0.4) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) tzinfo-data (1.2020.6) tzinfo (>= 1.0.0) uber (0.1.0) @@ -955,8 +958,8 @@ DEPENDENCIES database_cleaner (~> 1.8) date_validator (~> 0.10.0) deckar01-task_list (~> 2.3.1) - delayed_cron_job (~> 0.7.2) - delayed_job_active_record (~> 4.1.4) + delayed_cron_job (~> 0.7.4) + delayed_job_active_record (~> 4.1.5) disposable (~> 0.4.7) doorkeeper (~> 5.4.0) equivalent-xml (~> 0.6) @@ -1033,7 +1036,7 @@ DEPENDENCIES rack-protection (~> 2.1.0) rack-test (~> 1.1.0) rack_session_access - rails (~> 6.0.3.2) + rails (~> 6.1.0) rails-controller-testing (~> 1.0.2) rails-i18n (~> 6.0.0) rdoc (>= 2.4.2)