From e085e6781f15373fbb26b4a015c336e7686af0a5 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:23:39 +0200 Subject: [PATCH 01/29] remove no longer applicable rubocop on codeclimate job --- lib/tasks/dependencies.rake | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/lib/tasks/dependencies.rake b/lib/tasks/dependencies.rake index 13f65a9da5..758e5b382e 100644 --- a/lib/tasks/dependencies.rake +++ b/lib/tasks/dependencies.rake @@ -31,8 +31,7 @@ require 'open3' namespace :openproject do namespace :dependencies do desc 'Updates everything that is updatable automatically especially dependencies' - task update: ['openproject:dependencies:update:gems', - 'openproject:dependencies:update:rubocop'] + task update: %w[openproject:dependencies:update:gems] namespace :update do def parse_capture(capture, &block) @@ -74,30 +73,6 @@ namespace :openproject do end end end - - desc 'Update rubocop used on codeclimate to the extend supported' - task :rubocop do - out, _process = Open3.capture3('git', - 'ls-remote', - 'https://github.com/codeclimate/codeclimate-rubocop', - 'channel/rubocop*') - - parsed = parse_capture(out) do |line| - matches = line.match(/rubocop-(\d+)-(\d+)(?:-(\d+))?/).to_a - - # This version seems to have been a mistake - next if matches[0] == 'rubocop-1-70' - - matches[1..3].map(&:to_i) + [matches[0]] - end - - new_version = parsed.sort.pop.last - - Open3.capture3('sed', '-i.bak', "s/channel: rubocop[-0-9]*/channel: #{new_version}/", '.codeclimate.yml') - Open3.capture3('rm', '.codeclimate.yml.bak') - Open3.capture3('git', 'add', '.codeclimate.yml') - Open3.capture3('git', 'commit', '-m', "use #{new_version} on codeclimate") - end end end end From 91329d3dc3384508532681d162cc6d31f2c01ff3 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:25:04 +0200 Subject: [PATCH 02/29] bump aws-partitions --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 38ee95b0c5..c7d90b47a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.1.1) - aws-partitions (1.478.0) + aws-partitions (1.484.0) aws-sdk-core (3.117.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) From 57dfa7fdf8f5b88fd8b18714cd9fe4a3c6bdd72f Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:25:28 +0200 Subject: [PATCH 03/29] bump aws-sdk-core --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c7d90b47a2..e75739bb84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,7 +279,7 @@ GEM activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.1.1) aws-partitions (1.484.0) - aws-sdk-core (3.117.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) From c1eac7cefcee21365f6f9534771d99261238bf9e Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:25:50 +0200 Subject: [PATCH 04/29] bump aws-sdk-kms --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e75739bb84..b56f61415b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,8 +284,8 @@ GEM aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.96.1) aws-sdk-core (~> 3, >= 3.112.0) From 7eca95fd9eb68528b56cd86f50ea6448b058ba2a Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:26:13 +0200 Subject: [PATCH 05/29] bump aws-sdk-s3 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b56f61415b..62707c5b85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,8 +287,8 @@ GEM aws-sdk-kms (1.46.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.98.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sdk-sns (1.42.0) From 9c3075d74614accc56d75d91a6433168986a4f68 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:27:10 +0200 Subject: [PATCH 06/29] bump bootsnap --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 62707c5b85..089c3a5460 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -300,7 +300,7 @@ GEM bindata (2.4.10) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.7.5) + bootsnap (1.7.7) msgpack (~> 1.0) brakeman (5.0.4) browser (5.3.1) From c68c30ffcff5f5ef057692325c6c63e8ec300335 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:30:45 +0200 Subject: [PATCH 07/29] bump excon & faraday & faraday-rack & fog-aws & loofah & ruby2_keywords --- Gemfile.lock | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 089c3a5460..5046df181b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -448,7 +448,7 @@ GEM escape_utils (1.2.1) eventmachine (1.2.7) eventmachine_httpserver (0.2.1) - excon (0.84.0) + excon (0.85.0) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -456,7 +456,7 @@ GEM railties (>= 5.0.0) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.5.1) + faraday (1.6.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -464,6 +464,7 @@ GEM faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) @@ -475,10 +476,11 @@ GEM faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) + faraday-rack (1.0.0) fastimage (2.2.4) ffi (1.15.3) flamegraph (0.9.5) - fog-aws (3.10.0) + fog-aws (3.11.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -579,7 +581,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.10.0) + loofah (2.11.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -832,7 +834,7 @@ GEM ruby-saml (1.12.2) nokogiri (>= 1.10.5) rexml - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) rubytree (1.0.0) json (~> 2.1) structured_warnings (~> 0.3) From 2a569a934d78b648d92e1b08127fda8e537bf3a3 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:31:23 +0200 Subject: [PATCH 08/29] bump globalid --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5046df181b..9090c093e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -506,8 +506,8 @@ GEM ffi (~> 1.0) git (1.9.1) rchardet (~> 1.8) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) gon (6.4.0) actionpack (>= 3.0.20) i18n (>= 0.7) From dcf5cb31411a047a58e66426f305126b8005e7ee Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:32:54 +0200 Subject: [PATCH 09/29] bump i18n-js --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9090c093e1..4150688949 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -535,7 +535,7 @@ GEM httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) - i18n-js (3.8.3) + i18n-js (3.8.4) i18n (>= 0.6.6) icalendar (2.7.1) ice_cube (~> 0.16) From 95997ad6e5c77088d5aaf6f453ec20f1a7fb7bd9 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:35:28 +0200 Subject: [PATCH 10/29] bump nio4r --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4150688949..82ef830576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -610,7 +610,7 @@ GEM nap (1.1.0) net-ldap (0.17.0) netrc (0.11.0) - nio4r (2.5.7) + nio4r (2.5.8) no_proxy_fix (0.1.2) nokogiri (1.11.7) mini_portile2 (~> 2.5.0) From cf76a2db812a7a24a4627630a17bf02b13ced9eb Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:36:20 +0200 Subject: [PATCH 11/29] bump oj --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 82ef830576..db26e2b394 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -620,7 +620,7 @@ GEM octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - oj (3.12.1) + oj (3.12.3) okcomputer (1.18.4) omniauth-saml (1.10.3) omniauth (~> 1.3, >= 1.3.2) From 4e8fc0b81716a5f7647e9161d7b3b283cf8be142 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:38:28 +0200 Subject: [PATCH 12/29] bump rack-oauth2 & rubocop & rubocop-ast --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index db26e2b394..90efe8cfff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -702,7 +702,7 @@ GEM rack (>= 2.0.0) rack-mini-profiler (2.3.2) rack (>= 1.2.0) - rack-oauth2 (1.17.0) + rack-oauth2 (1.18.0) activesupport attr_required httpclient @@ -805,16 +805,16 @@ GEM rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.10.2) - rubocop (1.18.3) + rubocop (1.18.4) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.7.0, < 2.0) + rubocop-ast (>= 1.8.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.7.0) + rubocop-ast (1.9.0) parser (>= 3.0.1.1) rubocop-rails (2.11.3) activesupport (>= 4.2.0) From 552e1f50b1c2029e726e09b2a74e5c41f2101228 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:40:06 +0200 Subject: [PATCH 13/29] bump sentry-delayed_job --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 90efe8cfff..31ab504a35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -859,7 +859,8 @@ GEM childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) semantic (1.6.1) - sentry-delayed_job (4.6.1) + sentry-delayed_job (4.6.4) + delayed_job (>= 4.0) sentry-ruby-core (~> 4.6.0) sentry-rails (4.6.1) railties (>= 5.0) From a971488f159aa4a5125cc4d749b47158c0ddcdd7 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:40:27 +0200 Subject: [PATCH 14/29] bump sentry-rails --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 31ab504a35..e57f645741 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -862,7 +862,7 @@ GEM sentry-delayed_job (4.6.4) delayed_job (>= 4.0) sentry-ruby-core (~> 4.6.0) - sentry-rails (4.6.1) + sentry-rails (4.6.4) railties (>= 5.0) sentry-ruby-core (~> 4.6.0) sentry-ruby (4.6.1) From 69ae8ceaf09af598f97353dbbf84e3acca00f3bc Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:40:47 +0200 Subject: [PATCH 15/29] 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 e57f645741..e33268427f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -865,11 +865,11 @@ GEM sentry-rails (4.6.4) railties (>= 5.0) sentry-ruby-core (~> 4.6.0) - sentry-ruby (4.6.1) + sentry-ruby (4.6.4) concurrent-ruby (~> 1.0, >= 1.0.2) faraday (>= 1.0) - sentry-ruby-core (= 4.6.1) - sentry-ruby-core (4.6.1) + sentry-ruby-core (= 4.6.4) + sentry-ruby-core (4.6.4) concurrent-ruby faraday shoulda-context (2.0.0) From 350c04cd289bc60e223e5271cce7e9f366adcaec Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:42:03 +0200 Subject: [PATCH 16/29] bump sys-filesystem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e33268427f..3586cd6e8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -896,7 +896,7 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) - sys-filesystem (1.4.1) + sys-filesystem (1.4.2) ffi (~> 1.1) table_print (1.5.7) temple (0.8.2) From 88467e65693af2258914f4878d397a3507dac6e1 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 08:42:25 +0200 Subject: [PATCH 17/29] bump webmock --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3586cd6e8c..d73b8aaf84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -941,8 +941,8 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.13.0) - addressable (>= 2.3.6) + webmock (3.14.0) + addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.5) From 3f4c72468e23f0d67e6523b908617a90688dfc20 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:05:09 +0200 Subject: [PATCH 18/29] 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 d73b8aaf84..61f7913d8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ PATH remote: modules/two_factor_authentication specs: openproject-two_factor_authentication (1.0.0) - aws-sdk-sns (~> 1.42.0) + aws-sdk-sns (~> 1.44.0) messagebird-rest (~> 1.4.2) rotp (~> 6.1) @@ -291,8 +291,8 @@ GEM aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sns (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.4) 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 9ca5fc20f9..2af12948b4 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.42.0' + s.add_dependency 'aws-sdk-sns', '~> 1.44.0' end From e700d9b82a672d77101c2677ed687fae98760a4c Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:06:46 +0200 Subject: [PATCH 19/29] bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 78a6e7eeb3..c385ca19e1 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ ruby '~> 2.7.4' gem 'actionpack-xml_parser', '~> 2.0.0' gem 'activemodel-serializers-xml', '~> 1.0.1' -gem 'activerecord-import', '~> 1.1.0' +gem 'activerecord-import', '~> 1.2.0' gem 'activerecord-session_store', '~> 2.0.0' gem 'rails', '~> 6.1.3' gem 'responders', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 61f7913d8c..a8a599be38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -236,7 +236,7 @@ GEM activerecord (6.1.4) activemodel (= 6.1.4) activesupport (= 6.1.4) - activerecord-import (1.1.0) + activerecord-import (1.2.0) activerecord (>= 3.2) activerecord-nulldb-adapter (0.7.0) activerecord (>= 5.2.0, < 6.3) @@ -961,7 +961,7 @@ PLATFORMS DEPENDENCIES actionpack-xml_parser (~> 2.0.0) activemodel-serializers-xml (~> 1.0.1) - activerecord-import (~> 1.1.0) + activerecord-import (~> 1.2.0) activerecord-nulldb-adapter (~> 0.7.0) activerecord-session_store (~> 2.0.0) acts_as_list (~> 1.0.1) From 6dd36cb2773341f95457a6fd811a75dd02152b51 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:08:22 +0200 Subject: [PATCH 20/29] bump brakeman --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c385ca19e1..4211705714 100644 --- a/Gemfile +++ b/Gemfile @@ -284,7 +284,7 @@ group :development, :test do gem 'pry-stack_explorer', '~> 0.6.0' # Brakeman scanner - gem 'brakeman', '~> 5.0.0' + gem 'brakeman', '~> 5.1.0' gem 'danger-brakeman' end diff --git a/Gemfile.lock b/Gemfile.lock index a8a599be38..390a489ce6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -302,7 +302,7 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.7.7) msgpack (~> 1.0) - brakeman (5.0.4) + brakeman (5.1.1) browser (5.3.1) builder (3.2.4) byebug (11.1.3) @@ -974,7 +974,7 @@ DEPENDENCIES aws-sdk-s3 (~> 1.91) bcrypt (~> 3.1.6) bootsnap (~> 1.7.0) - brakeman (~> 5.0.0) + brakeman (~> 5.1.0) browser (~> 5.3.0) budgets! capybara (~> 3.35.0) From b74116b8b680e09c8f83a46691096ddcd9593e34 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:09:27 +0200 Subject: [PATCH 21/29] bump date_validator --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4211705714..3e160400a4 100644 --- a/Gemfile +++ b/Gemfile @@ -95,7 +95,7 @@ gem 'semantic', '~> 1.6.1' # used for statistics on svn repositories gem 'svg-graph', '~> 2.2.0' -gem 'date_validator', '~> 0.11.0' +gem 'date_validator', '~> 0.12.0' gem 'email_validator', '~> 2.2.3' gem 'ruby-duration', '~> 3.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 390a489ce6..137a8e2cb1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -382,7 +382,7 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date_validator (0.11.0) + date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) debug_inspector (1.1.0) @@ -991,7 +991,7 @@ DEPENDENCIES danger-brakeman dashboards! database_cleaner (~> 2.0) - date_validator (~> 0.11.0) + date_validator (~> 0.12.0) deckar01-task_list (~> 2.3.1) delayed_cron_job (~> 0.7.4) delayed_job_active_record (~> 4.1.5) From 6a34b48de239a4d61fd0496871a07c4c13ccc5d6 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:10:31 +0200 Subject: [PATCH 22/29] bump i18n-js --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3e160400a4..9d05971516 100644 --- a/Gemfile +++ b/Gemfile @@ -160,7 +160,7 @@ group :production do gem 'unicorn-worker-killer', require: false end -gem 'i18n-js', '~> 3.8.0' +gem 'i18n-js', '~> 3.9.0' gem 'rails-i18n', '~> 6.0.0' gem 'sprockets', '~> 3.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index 137a8e2cb1..e01956a232 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -535,7 +535,7 @@ GEM httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) - i18n-js (3.8.4) + i18n-js (3.9.0) i18n (>= 0.6.6) icalendar (2.7.1) ice_cube (~> 0.16) @@ -1012,7 +1012,7 @@ DEPENDENCIES grids! html-pipeline (~> 2.14.0) htmldiff - i18n-js (~> 3.8.0) + i18n-js (~> 3.9.0) json_spec (~> 1.1.4) ladle launchy (~> 2.5.0) From 4c184c9880b8be08a42f90eb4b0c15008aa8dff4 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:11:29 +0200 Subject: [PATCH 23/29] bump listen --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9d05971516..5ece8dc2c2 100644 --- a/Gemfile +++ b/Gemfile @@ -249,7 +249,7 @@ group :ldap do end group :development do - gem 'listen', '~> 3.5.1' # Use for event-based reloaders + gem 'listen', '~> 3.6.0' # Use for event-based reloaders gem 'faker' gem 'letter_opener' diff --git a/Gemfile.lock b/Gemfile.lock index e01956a232..f25befbc23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -563,7 +563,7 @@ GEM addressable (~> 2.7) letter_opener (1.7.0) launchy (~> 2.2) - listen (3.5.1) + listen (3.6.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) livingstyleguide (2.1.0) @@ -1017,7 +1017,7 @@ DEPENDENCIES ladle launchy (~> 2.5.0) letter_opener - listen (~> 3.5.1) + listen (~> 3.6.0) livingstyleguide (~> 2.1.0) lograge (~> 0.11.0) meta-tags (~> 2.14.0) From e4d7d7e560a152253bc78db9e8e92c9f242eaa6c Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:12:26 +0200 Subject: [PATCH 24/29] bump meta-tags --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5ece8dc2c2..9af60b14d9 100644 --- a/Gemfile +++ b/Gemfile @@ -149,7 +149,7 @@ gem 'prawn-markup', '~> 0.3.0' gem 'cells-erb', '~> 0.1.0' gem 'cells-rails', '~> 0.0.9' -gem 'meta-tags', '~> 2.14.0' +gem 'meta-tags', '~> 2.15.0' group :production do # we use dalli as standard memcache client diff --git a/Gemfile.lock b/Gemfile.lock index f25befbc23..c28fa1d56a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -588,7 +588,7 @@ GEM mini_mime (>= 0.1.1) marcel (1.0.1) messagebird-rest (1.4.2) - meta-tags (2.14.0) + meta-tags (2.15.0) actionpack (>= 3.2.0, < 6.2) method_source (1.0.0) mime-types (3.3.1) @@ -1020,7 +1020,7 @@ DEPENDENCIES listen (~> 3.6.0) livingstyleguide (~> 2.1.0) lograge (~> 0.11.0) - meta-tags (~> 2.14.0) + meta-tags (~> 2.15.0) mini_magick (~> 4.11.0) multi_json (~> 1.15.0) my_page! From 12a6167867da69916e27226b7832e69b1d3e584d Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:13:40 +0200 Subject: [PATCH 25/29] bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9af60b14d9..9d5fe9516c 100644 --- a/Gemfile +++ b/Gemfile @@ -170,7 +170,7 @@ gem 'unicorn' gem 'puma', '~> 5.3.0' # used for development and optionally for production -gem 'nokogiri', '~> 1.11.0' +gem 'nokogiri', '~> 1.12.0' gem 'carrierwave', '~> 1.3.1' gem 'carrierwave_direct', '~> 2.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index c28fa1d56a..ef0cda8a9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -596,7 +596,7 @@ GEM mime-types-data (3.2021.0704) mini_magick (4.11.0) mini_mime (1.1.0) - mini_portile2 (2.5.3) + mini_portile2 (2.6.1) minisyntax (0.2.5) minitest (5.14.4) mixlib-shellout (2.1.0) @@ -612,8 +612,8 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.2) + mini_portile2 (~> 2.6.1) racc (~> 1.4) nokogumbo (2.0.5) nokogiri (~> 1.8, >= 1.8.4) @@ -1025,7 +1025,7 @@ DEPENDENCIES multi_json (~> 1.15.0) my_page! net-ldap (~> 0.17.0) - nokogiri (~> 1.11.0) + nokogiri (~> 1.12.0) oj (~> 3.12.0) okcomputer (~> 1.18.1) omniauth! From 4ac0ac9bf4a194f648109c67a04f57fed2f0abd8 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:15:53 +0200 Subject: [PATCH 26/29] bump oj --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9d5fe9516c..c7312953d7 100644 --- a/Gemfile +++ b/Gemfile @@ -108,7 +108,7 @@ gem 'posix-spawn', '~> 0.3.13', require: false gem 'bcrypt', '~> 3.1.6' gem 'multi_json', '~> 1.15.0' -gem 'oj', '~> 3.12.0' +gem 'oj', '~> 3.13.0' gem 'daemons' gem 'delayed_cron_job', '~> 0.7.4' diff --git a/Gemfile.lock b/Gemfile.lock index ef0cda8a9b..26c669a5c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -620,7 +620,7 @@ GEM octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - oj (3.12.3) + oj (3.13.0) okcomputer (1.18.4) omniauth-saml (1.10.3) omniauth (~> 1.3, >= 1.3.2) @@ -1026,7 +1026,7 @@ DEPENDENCIES my_page! net-ldap (~> 0.17.0) nokogiri (~> 1.12.0) - oj (~> 3.12.0) + oj (~> 3.13.0) okcomputer (~> 1.18.1) omniauth! omniauth-openid-connect! From 98b9cbe2832cbd6d72131c1569cb107813a9b77b Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:25:22 +0200 Subject: [PATCH 27/29] bump puma --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c7312953d7..61a950b1aa 100644 --- a/Gemfile +++ b/Gemfile @@ -168,7 +168,7 @@ gem 'sprockets', '~> 3.7.0' # also, better than thin since we can control worker concurrency. gem 'unicorn' -gem 'puma', '~> 5.3.0' # used for development and optionally for production +gem 'puma', '~> 5.4.0' # used for development and optionally for production gem 'nokogiri', '~> 1.12.0' diff --git a/Gemfile.lock b/Gemfile.lock index 26c669a5c8..e4481a5daf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -690,7 +690,7 @@ GEM eventmachine_httpserver http_parser.rb (~> 0.6.0) multi_json - puma (5.3.2) + puma (5.4.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -1064,7 +1064,7 @@ DEPENDENCIES pry-rescue (~> 1.5.2) pry-stack_explorer (~> 0.6.0) puffing-billy (~> 2.4.0) - puma (~> 5.3.0) + puma (~> 5.4.0) rack-attack (~> 6.5.0) rack-cors (~> 1.1.1) rack-mini-profiler From 433fc8858195e4870a317696c9eb43db2577aed8 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:25:32 +0200 Subject: [PATCH 28/29] bump sanitize --- Gemfile | 2 +- Gemfile.lock | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 61a950b1aa..1db51aaf1f 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ gem 'escape_utils', '~> 1.0' # Syntax highlighting used in html-pipeline with rouge gem 'rouge', '~> 3.26.0' # HTML sanitization used for html-pipeline -gem 'sanitize', '~> 5.2.1' +gem 'sanitize', '~> 6.0.0' # HTML autolinking for mails and urls (replaces autolink) gem 'rinku', '~> 2.0.4' # Version parsing with semver diff --git a/Gemfile.lock b/Gemfile.lock index e4481a5daf..fe910973d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -615,8 +615,6 @@ GEM nokogiri (1.12.2) mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogumbo (2.0.5) - nokogiri (~> 1.8, >= 1.8.4) octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) @@ -839,10 +837,9 @@ GEM json (~> 2.1) structured_warnings (~> 0.3) rubyzip (2.3.2) - sanitize (5.2.3) + sanitize (6.0.0) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) + nokogiri (>= 1.12.0) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -1092,7 +1089,7 @@ DEPENDENCIES ruby-prof ruby-progressbar (~> 1.11.0) rubytree (~> 1.0.0) - sanitize (~> 5.2.1) + sanitize (~> 6.0.0) sassc-rails secure_headers (~> 6.3.0) selenium-webdriver (~> 3.14) From 622be3ba4cb65366a98a2a04adc9129dc0be2241 Mon Sep 17 00:00:00 2001 From: ulferts Date: Mon, 9 Aug 2021 09:27:19 +0200 Subject: [PATCH 29/29] bump shoulda-matchers --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 1db51aaf1f..e959c3688b 100644 --- a/Gemfile +++ b/Gemfile @@ -239,7 +239,7 @@ group :test do gem 'equivalent-xml', '~> 0.6' gem 'json_spec', '~> 1.1.4' - gem 'shoulda-matchers', '~> 4.5', require: nil + gem 'shoulda-matchers', '~> 5.0', require: nil gem 'parallel_tests', '~> 3.1' end diff --git a/Gemfile.lock b/Gemfile.lock index fe910973d7..c7cf3a4bb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -870,8 +870,8 @@ GEM concurrent-ruby faraday shoulda-context (2.0.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) + shoulda-matchers (5.0.0) + activesupport (>= 5.2.0) spreadsheet (1.2.9) ruby-ole spring (2.1.1) @@ -1098,7 +1098,7 @@ DEPENDENCIES sentry-rails (~> 4.6.0) sentry-ruby (~> 4.6.0) shoulda-context (~> 2.0) - shoulda-matchers (~> 4.5) + shoulda-matchers (~> 5.0) spring spring-commands-rspec sprockets (~> 3.7.0)