From 662e3459efa6d41819563df4b0a3efe8df11ead0 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:31:38 +0100 Subject: [PATCH 01/36] bump aws-sdk-kms & zeitwerk --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 27b0088c99..c612f7753a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,8 +279,8 @@ GEM aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.52.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-kms (1.53.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.109.0) aws-sdk-core (~> 3, >= 3.122.0) @@ -953,7 +953,7 @@ GEM activerecord (>= 4.2) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.5.1) + zeitwerk (2.5.3) PLATFORMS ruby From eef0a04ca4c7f21a780716ab18200218e589cb4a Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:31:48 +0100 Subject: [PATCH 02/36] bump aws-sdk-s3 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c612f7753a..383087ff4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,8 +282,8 @@ GEM aws-sdk-kms (1.53.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.109.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-s3 (1.110.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-sns (1.49.0) From 0fd35f575f161740d2fa380deeba9e18c3f56973 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:32:35 +0100 Subject: [PATCH 03/36] bump dalli --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 383087ff4e..b960f84e28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -351,7 +351,7 @@ GEM rexml crass (1.0.6) daemons (1.4.1) - dalli (3.1.5) + dalli (3.1.6) danger (8.4.2) claide (~> 1.0) claide-plugins (>= 0.9.2) From 4c81654f4a35496959cb6dcde626d4a71ca129be Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:32:53 +0100 Subject: [PATCH 04/36] bump diff-lcs --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b960f84e28..b3466af0e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM delayed_job_active_record (4.1.6) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - diff-lcs (1.4.4) + diff-lcs (1.5.0) disposable (0.6.2) declarative (>= 0.0.9, < 1.0.0) representable (>= 3.1.1, < 3.2.0) From ce0c1d0bfdc34643a731a7fe216f6d833913bb81 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:33:03 +0100 Subject: [PATCH 05/36] bump fastimage --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b3466af0e5..02df75f4fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -472,7 +472,7 @@ GEM faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - fastimage (2.2.5) + fastimage (2.2.6) ffi (1.15.4) flamegraph (0.9.5) fog-aws (3.12.0) From 36b259ff69d516bc879a288a47c493769daa3e18 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:33:14 +0100 Subject: [PATCH 06/36] bump git --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 02df75f4fb..e2e3dd19a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -500,7 +500,7 @@ GEM fuubar (2.5.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - git (1.9.1) + git (1.10.0) rchardet (~> 1.8) globalid (1.0.0) activesupport (>= 5.0) From 844ae4b176212746ebca5a8b73a9b03898fdeb7a Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:33:25 +0100 Subject: [PATCH 07/36] bump grape --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e2e3dd19a3..e27791a866 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -509,7 +509,7 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - grape (1.6.0) + grape (1.6.2) activesupport builder dry-types (>= 1.1) From d933808eb1c722abc44cc93c796507909a2c2660 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:34:43 +0100 Subject: [PATCH 08/36] bump parser --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e27791a866..218345c58f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -643,7 +643,7 @@ GEM parallel (1.21.0) parallel_tests (3.7.3) parallel - parser (3.0.3.2) + parser (3.1.0.0) ast (~> 2.4.1) pdf-core (0.9.0) pdf-inspector (1.3.0) From 02d85272c25e95edb9ed1c84ea9f4abc0b128c17 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:34:52 +0100 Subject: [PATCH 09/36] bump pdf-reader --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 218345c58f..539da25c5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -648,7 +648,7 @@ GEM pdf-core (0.9.0) pdf-inspector (1.3.0) pdf-reader (>= 1.0, < 3.0.a) - pdf-reader (2.6.0) + pdf-reader (2.8.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) From 4ad299269f527c6bb74c2d39f28352c35dad4ab9 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:36:02 +0100 Subject: [PATCH 10/36] bump psych & rdoc & stringio --- Gemfile.lock | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 539da25c5a..2d18b58f22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -683,6 +683,8 @@ GEM pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) + psych (4.0.3) + stringio public_suffix (4.0.6) puffing-billy (2.4.1) addressable (~> 2.5) @@ -761,7 +763,8 @@ GEM ffi (~> 1.0) rbtree3 (0.6.0) rchardet (1.8.0) - rdoc (6.3.3) + rdoc (6.4.0) + psych (>= 4.0.0) recaptcha (5.8.1) json redcarpet (3.5.1) @@ -894,6 +897,7 @@ GEM ssrf_filter (1.0.7) stackprof (0.2.17) stringex (2.8.5) + stringio (3.0.1) structured_warnings (0.4.0) svg-graph (2.2.1) swd (1.3.0) From 6a884e0fc54edda5dc28801262eec267ffddc46c Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:36:22 +0100 Subject: [PATCH 11/36] bump rubocop & rubocop-ast --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2d18b58f22..501f343905 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -813,16 +813,16 @@ GEM rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.10.3) - rubocop (1.23.0) + rubocop (1.24.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.12.0, < 2.0) + rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.0) + rubocop-ast (1.15.1) parser (>= 3.0.1.1) rubocop-rails (2.12.4) activesupport (>= 4.2.0) From 1211cde25298e66198e74a239c006a0fcd875634 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:36:42 +0100 Subject: [PATCH 12/36] bump rubocop-rails --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 501f343905..17415ac591 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -824,7 +824,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.15.1) parser (>= 3.0.1.1) - rubocop-rails (2.12.4) + rubocop-rails (2.13.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) From 7226ddf8d0a680c705eb1bd4675e69cc47e72a4a Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:36:53 +0100 Subject: [PATCH 13/36] bump rubocop-rspec --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 17415ac591..1ea45d56cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -828,7 +828,7 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.6.0) + rubocop-rspec (2.7.0) rubocop (~> 1.19) ruby-duration (3.2.3) activesupport (>= 3.0.0) From 914855277f1649150dfba27352d28819984cdb3a Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:37:02 +0100 Subject: [PATCH 14/36] bump rubytree --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1ea45d56cf..0f44c62676 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -842,9 +842,9 @@ GEM nokogiri (>= 1.10.5) rexml ruby2_keywords (0.0.5) - rubytree (1.0.0) - json (~> 2.1) - structured_warnings (~> 0.3) + rubytree (1.0.2) + json (~> 2.6.1) + structured_warnings (~> 0.4.0) rubyzip (2.3.2) sanitize (6.0.0) crass (~> 1.0.2) From 639e691180814bbebabaafeeb88aba7fad18d75e Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:37:13 +0100 Subject: [PATCH 15/36] bump shoulda-matchers --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0f44c62676..8c1f6f3808 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -880,7 +880,7 @@ GEM concurrent-ruby faraday shoulda-context (2.0.0) - shoulda-matchers (5.0.0) + shoulda-matchers (5.1.0) activesupport (>= 5.2.0) spreadsheet (1.3.0) ruby-ole From cc20dc06cf8e0aa8d7c695241d574b239a4a086b Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:39:06 +0100 Subject: [PATCH 16/36] bump brakeman --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 54a31e85fc..8daa5950be 100644 --- a/Gemfile +++ b/Gemfile @@ -280,7 +280,7 @@ group :development, :test do gem 'pry-stack_explorer', '~> 0.6.0' # Brakeman scanner - gem 'brakeman', '~> 5.1.0' + gem 'brakeman', '~> 5.2.0' gem 'danger-brakeman' end diff --git a/Gemfile.lock b/Gemfile.lock index 8c1f6f3808..01ae9d6fc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -297,7 +297,7 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.9.3) msgpack (~> 1.0) - brakeman (5.1.2) + brakeman (5.2.0) browser (5.3.1) builder (3.2.4) byebug (11.1.3) @@ -978,7 +978,7 @@ DEPENDENCIES aws-sdk-s3 (~> 1.91) bcrypt (~> 3.1.6) bootsnap (~> 1.9.1) - brakeman (~> 5.1.0) + brakeman (~> 5.2.0) browser (~> 5.3.0) budgets! capybara (~> 3.36.0) From d605c778032c7f9d8279ee0fb3b3ae60e102a659 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:40:10 +0100 Subject: [PATCH 17/36] bump rouge --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8daa5950be..2ffbc55f59 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ gem 'deckar01-task_list', '~> 2.3.1' # Requires escape-utils for faster escaping gem 'escape_utils', '~> 1.0' # Syntax highlighting used in html-pipeline with rouge -gem 'rouge', '~> 3.26.0' +gem 'rouge', '~> 3.27.0' # HTML sanitization used for html-pipeline gem 'sanitize', '~> 6.0.0' # HTML autolinking for mails and urls (replaces autolink) diff --git a/Gemfile.lock b/Gemfile.lock index 01ae9d6fc9..2f35ede4a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -789,7 +789,7 @@ GEM roar (1.1.1) representable (~> 3.0) rotp (6.2.0) - rouge (3.26.1) + rouge (3.27.0) rspec (3.10.0) rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) @@ -1089,7 +1089,7 @@ DEPENDENCIES retriable (~> 3.1.1) rinku (~> 2.0.4) roar (~> 1.1.0) - rouge (~> 3.26.0) + rouge (~> 3.27.0) rspec (~> 3.10.0) rspec-rails (~> 5.0.0) rspec-retry (~> 0.6.1) From c8a665ce72be68c2a6379cabcf3f8141bc47bbbf Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:41:14 +0100 Subject: [PATCH 18/36] bump aws-sdk-sns --- Gemfile.lock | 6 +++--- .../openproject-two_factor_authentication.gemspec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2f35ede4a3..295f1669e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,7 +159,7 @@ PATH remote: modules/two_factor_authentication specs: openproject-two_factor_authentication (1.0.0) - aws-sdk-sns (~> 1.49.0) + aws-sdk-sns (~> 1.50.0) messagebird-rest (~> 1.4.2) rotp (~> 6.1) @@ -286,8 +286,8 @@ GEM aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-sns (1.49.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-sns (1.50.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) diff --git a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec index 2ce558ea58..e24067131c 100644 --- a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec +++ b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec @@ -15,5 +15,5 @@ Gem::Specification.new do |s| s.add_dependency 'messagebird-rest', '~> 1.4.2' s.add_dependency 'rotp', '~> 6.1' - s.add_dependency 'aws-sdk-sns', '~> 1.49.0' + s.add_dependency 'aws-sdk-sns', '~> 1.50.0' end From 7ed4f85a39f712ea7cf0401819d4a82efedde062 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:43:32 +0100 Subject: [PATCH 19/36] bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 2ffbc55f59..1d77749805 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ ruby '~> 2.7.5' gem 'actionpack-xml_parser', '~> 2.0.0' gem 'activemodel-serializers-xml', '~> 1.0.1' -gem 'activerecord-import', '~> 1.2.0' +gem 'activerecord-import', '~> 1.3.0' gem 'activerecord-session_store', '~> 2.0.0' gem 'rails', '~> 6.1.4' gem 'responders', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 295f1669e9..0b9be2fe7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -231,8 +231,8 @@ GEM activerecord (6.1.4.4) activemodel (= 6.1.4.4) activesupport (= 6.1.4.4) - activerecord-import (1.2.0) - activerecord (>= 3.2) + activerecord-import (1.3.0) + activerecord (>= 4.2) activerecord-nulldb-adapter (0.8.0) activerecord (>= 5.2.0, < 7.1) activerecord-session_store (2.0.0) @@ -965,7 +965,7 @@ PLATFORMS DEPENDENCIES actionpack-xml_parser (~> 2.0.0) activemodel-serializers-xml (~> 1.0.1) - activerecord-import (~> 1.2.0) + activerecord-import (~> 1.3.0) activerecord-nulldb-adapter (~> 0.8.0) activerecord-session_store (~> 2.0.0) acts_as_list (~> 1.0.1) From 8c40f3d6d3810a85d3eca02bfd314986167ee39d Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 3 Jan 2022 09:45:26 +0100 Subject: [PATCH 20/36] bump rails-i18n --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 1d77749805..156eff8441 100644 --- a/Gemfile +++ b/Gemfile @@ -159,7 +159,7 @@ group :production do end gem 'i18n-js', '~> 3.9.0' -gem 'rails-i18n', '~> 6.0.0' +gem 'rails-i18n', '~> 7.0.0' gem 'sprockets', '~> 3.7.0' gem 'puma', '~> 5.5' diff --git a/Gemfile.lock b/Gemfile.lock index 0b9be2fe7e..f120d6746a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -747,9 +747,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails-i18n (6.0.0) + rails-i18n (7.0.1) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 7) + railties (>= 6.0.0, < 8) railties (6.1.4.4) actionpack (= 6.1.4.4) activesupport (= 6.1.4.4) @@ -1081,7 +1081,7 @@ DEPENDENCIES rack_session_access rails (~> 6.1.4) rails-controller-testing (~> 1.0.2) - rails-i18n (~> 6.0.0) + rails-i18n (~> 7.0.0) rdoc (>= 2.4.2) request_store (~> 1.5.0) responders (~> 3.0) From 5d870216a7c9c0d59530a4e898281ec6258e4166 Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 5 Jan 2022 14:46:11 +0100 Subject: [PATCH 21/36] bump aws-partitions --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f120d6746a..52b318e375 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.2.0) - aws-partitions (1.543.0) + aws-partitions (1.544.0) aws-sdk-core (3.125.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) From 242e9c93065e7987196a46caf714f929ab71c6c8 Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 5 Jan 2022 14:46:27 +0100 Subject: [PATCH 22/36] bump aws-sdk-core --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 52b318e375..80dcbdb38f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.2.0) aws-partitions (1.544.0) - aws-sdk-core (3.125.0) + aws-sdk-core (3.125.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) From d0b6ccc84bf773a52966618ff63a30a6ad1960c7 Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 5 Jan 2022 14:46:46 +0100 Subject: [PATCH 23/36] bump aws-sdk-s3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 80dcbdb38f..5f4452d083 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,7 +282,7 @@ GEM aws-sdk-kms (1.53.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.110.0) + aws-sdk-s3 (1.111.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) From fa62f64a41676b804026c079f8a8767c3c90b98e Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 5 Jan 2022 14:49:28 +0100 Subject: [PATCH 24/36] bump git --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5f4452d083..6a2005aac9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -500,7 +500,7 @@ GEM fuubar (2.5.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - git (1.10.0) + git (1.10.1) rchardet (~> 1.8) globalid (1.0.0) activesupport (>= 5.0) From cd00cdd405dd5f44fea2317cec7c8644ba35d71f Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 5 Jan 2022 14:53:22 +0100 Subject: [PATCH 25/36] bump sentry-ruby & sentry-ruby-core & thor --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a2005aac9..90870b43f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -872,11 +872,11 @@ GEM sentry-rails (4.8.1) railties (>= 5.0) sentry-ruby-core (~> 4.8.1) - sentry-ruby (4.8.1) + sentry-ruby (4.8.2) concurrent-ruby (~> 1.0, >= 1.0.2) - faraday (>= 1.0) - sentry-ruby-core (= 4.8.1) - sentry-ruby-core (4.8.1) + faraday (~> 1.0) + sentry-ruby-core (= 4.8.2) + sentry-ruby-core (4.8.2) concurrent-ruby faraday shoulda-context (2.0.0) @@ -911,7 +911,7 @@ GEM terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) test-prof (1.0.7) - thor (1.1.0) + thor (1.2.1) tilt (2.0.10) timecop (0.9.4) trailblazer-option (0.1.2) From 1f3a37c318aeda7aacfbe988a388520fbb22a7ba Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 5 Jan 2022 14:56:20 +0100 Subject: [PATCH 26/36] bump dalli --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 156eff8441..35c8b92453 100644 --- a/Gemfile +++ b/Gemfile @@ -155,7 +155,7 @@ gem 'meta-tags', '~> 2.16.0' group :production do # we use dalli as standard memcache client # requires memcached 1.4+ - gem 'dalli', '~> 3.1.0' + gem 'dalli', '~> 3.2.0' end gem 'i18n-js', '~> 3.9.0' diff --git a/Gemfile.lock b/Gemfile.lock index 90870b43f7..a4536f8111 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -351,7 +351,7 @@ GEM rexml crass (1.0.6) daemons (1.4.1) - dalli (3.1.6) + dalli (3.2.0) danger (8.4.2) claide (~> 1.0) claide-plugins (>= 0.9.2) @@ -991,7 +991,7 @@ DEPENDENCIES compare-xml (~> 0.66) costs! daemons - dalli (~> 3.1.0) + dalli (~> 3.2.0) danger-brakeman dashboards! database_cleaner (~> 2.0) From e3a393ee1e05066d54f25cdb9eb7a209dfddbade Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 5 Jan 2022 14:57:14 +0100 Subject: [PATCH 27/36] bump sentry-delayed_job & sentry-rails --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a4536f8111..1d86d40eaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -866,12 +866,12 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) semantic (1.6.1) - sentry-delayed_job (4.8.1) + sentry-delayed_job (4.8.2) delayed_job (>= 4.0) - sentry-ruby-core (~> 4.8.1) - sentry-rails (4.8.1) + sentry-ruby-core (~> 4.8.2) + sentry-rails (4.8.2) railties (>= 5.0) - sentry-ruby-core (~> 4.8.1) + sentry-ruby-core (~> 4.8.2) sentry-ruby (4.8.2) concurrent-ruby (~> 1.0, >= 1.0.2) faraday (~> 1.0) From b32a16436c0ca5fa175d0596eae072aa22a4e2cc Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 13:33:22 +0100 Subject: [PATCH 28/36] bump aws-partitions --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d86d40eaa..f941063502 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.2.0) - aws-partitions (1.544.0) + aws-partitions (1.546.0) aws-sdk-core (3.125.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) From 0686e8145ffefa95b80a16041127fa6562454a4b Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 13:33:34 +0100 Subject: [PATCH 29/36] bump aws-sdk-s3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f941063502..6638c0bcc0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,7 +282,7 @@ GEM aws-sdk-kms (1.53.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.111.0) + aws-sdk-s3 (1.111.1) aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) From 03106eb18e457883ecec0fe7d48804d1527e6be8 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 13:34:30 +0100 Subject: [PATCH 30/36] bump faraday & faraday-multipart & faraday-retry & mime-types-data --- Gemfile.lock | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6638c0bcc0..7c75ac1aa5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -451,16 +451,17 @@ GEM railties (>= 5.0.0) faker (2.19.0) i18n (>= 1.6, < 2) - faraday (1.8.0) + faraday (1.9.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) @@ -468,10 +469,13 @@ GEM faraday-http-cache (2.2.0) faraday (>= 0.8) faraday-httpclient (1.0.1) + faraday-multipart (1.0.2) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) + faraday-retry (1.0.3) fastimage (2.2.6) ffi (1.15.4) flamegraph (0.9.5) @@ -598,7 +602,7 @@ GEM method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) + mime-types-data (3.2022.0105) mini_magick (4.11.0) mini_mime (1.1.2) mini_portile2 (2.6.1) From 25dac9720f91fc239469128e7697bd129ea46e24 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 13:35:35 +0100 Subject: [PATCH 31/36] bump git --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7c75ac1aa5..a02884a6c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -504,7 +504,7 @@ GEM fuubar (2.5.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - git (1.10.1) + git (1.10.2) rchardet (~> 1.8) globalid (1.0.0) activesupport (>= 5.0) From 5941baf755806cedea3340daddf7c6b649a930c9 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 13:37:56 +0100 Subject: [PATCH 32/36] bump oj --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a02884a6c6..4a68f11174 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -626,7 +626,7 @@ GEM octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - oj (3.13.10) + oj (3.13.11) okcomputer (1.18.4) omniauth-saml (1.10.3) omniauth (~> 1.3, >= 1.3.2) From c27daacb1cab3f95faef47456db09d5ec4eb42b8 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 13:40:38 +0100 Subject: [PATCH 33/36] bump sentry-ruby & sentry-ruby-core --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4a68f11174..e705de6d72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -876,11 +876,11 @@ GEM sentry-rails (4.8.2) railties (>= 5.0) sentry-ruby-core (~> 4.8.2) - sentry-ruby (4.8.2) + sentry-ruby (4.8.3) concurrent-ruby (~> 1.0, >= 1.0.2) faraday (~> 1.0) - sentry-ruby-core (= 4.8.2) - sentry-ruby-core (4.8.2) + sentry-ruby-core (= 4.8.3) + sentry-ruby-core (4.8.3) concurrent-ruby faraday shoulda-context (2.0.0) From e3f8d1efe354917e2b8824d648ff75305a42b412 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 14:35:12 +0100 Subject: [PATCH 34/36] adapt to changes in Psych.safe_load --- app/models/custom_actions/actions/serializer.rb | 2 +- app/models/setting.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/custom_actions/actions/serializer.rb b/app/models/custom_actions/actions/serializer.rb index 3a2d678c45..680d7ca2ff 100644 --- a/app/models/custom_actions/actions/serializer.rb +++ b/app/models/custom_actions/actions/serializer.rb @@ -33,7 +33,7 @@ class CustomActions::Actions::Serializer return [] unless value YAML - .safe_load(value, [Symbol]) + .safe_load(value, permitted_classes: [Symbol]) .map do |key, values| klass = nil diff --git a/app/models/setting.rb b/app/models/setting.rb index 77883879c2..70d26ee827 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -149,7 +149,7 @@ class Setting < ApplicationRecord end def formatted_value(value) - return value unless value.present? + return value if value.blank? default = @@available_settings[name] @@ -314,7 +314,7 @@ class Setting < ApplicationRecord default = @@available_settings[name] if default['serialized'] && v.is_a?(String) - YAML::load(v) + YAML::safe_load(v, permitted_classes: [Symbol, ActiveSupport::HashWithIndifferentAccess, Date, Time]) elsif v.present? read_formatted_setting v, default["format"] else From d9d0df0cb896d182b9525399909213fd2e76f744 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 15:03:53 +0100 Subject: [PATCH 35/36] bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 35c8b92453..1951b756be 100644 --- a/Gemfile +++ b/Gemfile @@ -166,7 +166,7 @@ gem 'puma', '~> 5.5' gem 'rack-timeout', '~> 0.6.0', require: "rack/timeout/base" gem 'puma-plugin-statsd', '~> 2.0' -gem 'nokogiri', '~> 1.12.5' +gem 'nokogiri', '~> 1.13.0' gem 'carrierwave', '~> 1.3.1' gem 'carrierwave_direct', '~> 2.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index e705de6d72..531b50bfd8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -605,7 +605,7 @@ GEM mime-types-data (3.2022.0105) mini_magick (4.11.0) mini_mime (1.1.2) - mini_portile2 (2.6.1) + mini_portile2 (2.7.1) minisyntax (0.2.5) minitest (5.15.0) msgpack (1.4.2) @@ -620,8 +620,8 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.0) + mini_portile2 (~> 2.7.0) racc (~> 1.4) octokit (4.21.0) faraday (>= 0.9) @@ -1035,7 +1035,7 @@ DEPENDENCIES multi_json (~> 1.15.0) my_page! net-ldap (~> 0.17.0) - nokogiri (~> 1.12.5) + nokogiri (~> 1.13.0) oj (~> 3.13.0) okcomputer (~> 1.18.1) omniauth! From 523f34d6a9846568ae78ba22f986a6bf5e884884 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 7 Jan 2022 15:04:51 +0100 Subject: [PATCH 36/36] bump sentry-delayed_job & sentry-rails --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 531b50bfd8..6ec003ae99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -870,12 +870,12 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) semantic (1.6.1) - sentry-delayed_job (4.8.2) + sentry-delayed_job (4.8.3) delayed_job (>= 4.0) - sentry-ruby-core (~> 4.8.2) - sentry-rails (4.8.2) + sentry-ruby-core (~> 4.8.3) + sentry-rails (4.8.3) railties (>= 5.0) - sentry-ruby-core (~> 4.8.2) + sentry-ruby-core (~> 4.8.3) sentry-ruby (4.8.3) concurrent-ruby (~> 1.0, >= 1.0.2) faraday (~> 1.0)