From 5b7a969964a9d1a1600c273dc6fecf128834be01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 25 Aug 2022 21:29:23 +0200 Subject: [PATCH 01/16] Fix Rails/ReversibleMigration rule offenses We forgot to do so in commit fc757428e, when we upgraded rubocop-rails. In this upgrade, this rule was changed to include the `change_column` method. Just like we did in commit df959b74f, I'm raising an `ActiveRecord::IrreversibleMigration` exception in migrations done before version 1.0.0, since making all of them reversible would be too much work for little benefit. --- db/migrate/20150806111435_change_debates_title_length.rb | 6 +++++- db/migrate/20151019133719_remove_user_constraints.rb | 6 +++++- ...3175139_make_comments_confidence_score_default_to_0.rb | 6 +++++- .../20160418172919_activate_newsletter_by_default.rb | 6 +++++- db/migrate/20161102133838_default_password_changed_at.rb | 6 +++++- db/migrate/20170102080432_adjust_budget_fields.rb | 6 +++++- ...11105_change_newsletter_segment_recipient_to_string.rb | 6 +++++- ...add_short_description_to_proposal_dashboard_actions.rb | 6 +++++- ...00908084257_change_attachment_size_fields_to_bigint.rb | 8 +++++++- 9 files changed, 47 insertions(+), 9 deletions(-) diff --git a/db/migrate/20150806111435_change_debates_title_length.rb b/db/migrate/20150806111435_change_debates_title_length.rb index bbf50b4edeaf..71384f21d5b6 100644 --- a/db/migrate/20150806111435_change_debates_title_length.rb +++ b/db/migrate/20150806111435_change_debates_title_length.rb @@ -1,5 +1,9 @@ class ChangeDebatesTitleLength < ActiveRecord::Migration[4.2] - def change + def up change_column :debates, :title, :string, limit: 80 end + + def down + fail ActiveRecord::IrreversibleMigration + end end diff --git a/db/migrate/20151019133719_remove_user_constraints.rb b/db/migrate/20151019133719_remove_user_constraints.rb index c78bf6660781..98736893128b 100644 --- a/db/migrate/20151019133719_remove_user_constraints.rb +++ b/db/migrate/20151019133719_remove_user_constraints.rb @@ -1,5 +1,9 @@ class RemoveUserConstraints < ActiveRecord::Migration[4.2] - def change + def up change_column(:users, :email, :string, null: true, unique: true) end + + def down + fail ActiveRecord::IrreversibleMigration + end end diff --git a/db/migrate/20151103175139_make_comments_confidence_score_default_to_0.rb b/db/migrate/20151103175139_make_comments_confidence_score_default_to_0.rb index de12b54be610..4ab2f7d86eff 100644 --- a/db/migrate/20151103175139_make_comments_confidence_score_default_to_0.rb +++ b/db/migrate/20151103175139_make_comments_confidence_score_default_to_0.rb @@ -1,5 +1,9 @@ class MakeCommentsConfidenceScoreDefaultTo0 < ActiveRecord::Migration[4.2] - def change + def up change_column :comments, :confidence_score, :integer, default: 0, null: false, index: true end + + def down + fail ActiveRecord::IrreversibleMigration + end end diff --git a/db/migrate/20160418172919_activate_newsletter_by_default.rb b/db/migrate/20160418172919_activate_newsletter_by_default.rb index c752846568b7..d14f90129014 100644 --- a/db/migrate/20160418172919_activate_newsletter_by_default.rb +++ b/db/migrate/20160418172919_activate_newsletter_by_default.rb @@ -1,5 +1,9 @@ class ActivateNewsletterByDefault < ActiveRecord::Migration[4.2] - def change + def up change_column :users, :newsletter, :boolean, default: true end + + def down + fail ActiveRecord::IrreversibleMigration + end end diff --git a/db/migrate/20161102133838_default_password_changed_at.rb b/db/migrate/20161102133838_default_password_changed_at.rb index 81320d0f27d4..4ee2add849e2 100644 --- a/db/migrate/20161102133838_default_password_changed_at.rb +++ b/db/migrate/20161102133838_default_password_changed_at.rb @@ -1,5 +1,9 @@ class DefaultPasswordChangedAt < ActiveRecord::Migration[4.2] - def change + def up change_column :users, :password_changed_at, :datetime, null: false, default: Time.zone.now end + + def down + fail ActiveRecord::IrreversibleMigration + end end diff --git a/db/migrate/20170102080432_adjust_budget_fields.rb b/db/migrate/20170102080432_adjust_budget_fields.rb index f2a4427dc0c5..d53a618b21e6 100644 --- a/db/migrate/20170102080432_adjust_budget_fields.rb +++ b/db/migrate/20170102080432_adjust_budget_fields.rb @@ -1,5 +1,9 @@ class AdjustBudgetFields < ActiveRecord::Migration[4.2] - def change + def up change_column :budgets, :phase, :string, limit: 40, default: "accepting" end + + def down + fail ActiveRecord::IrreversibleMigration + end end diff --git a/db/migrate/20180220211105_change_newsletter_segment_recipient_to_string.rb b/db/migrate/20180220211105_change_newsletter_segment_recipient_to_string.rb index 4d34e4303984..5e5c8280f9f3 100644 --- a/db/migrate/20180220211105_change_newsletter_segment_recipient_to_string.rb +++ b/db/migrate/20180220211105_change_newsletter_segment_recipient_to_string.rb @@ -1,5 +1,9 @@ class ChangeNewsletterSegmentRecipientToString < ActiveRecord::Migration[4.2] - def change + def up change_column :newsletters, :segment_recipient, :string, null: false end + + def down + fail ActiveRecord::IrreversibleMigration + end end diff --git a/db/migrate/20180702050717_add_short_description_to_proposal_dashboard_actions.rb b/db/migrate/20180702050717_add_short_description_to_proposal_dashboard_actions.rb index 2a6143d57c0a..2e1685652215 100644 --- a/db/migrate/20180702050717_add_short_description_to_proposal_dashboard_actions.rb +++ b/db/migrate/20180702050717_add_short_description_to_proposal_dashboard_actions.rb @@ -1,6 +1,10 @@ class AddShortDescriptionToProposalDashboardActions < ActiveRecord::Migration[4.2] - def change + def up add_column :proposal_dashboard_actions, :short_description, :string change_column :proposal_dashboard_actions, :description, :text end + + def down + fail ActiveRecord::IrreversibleMigration + end end diff --git a/db/migrate/20200908084257_change_attachment_size_fields_to_bigint.rb b/db/migrate/20200908084257_change_attachment_size_fields_to_bigint.rb index 65d36a3c8675..999170431a96 100644 --- a/db/migrate/20200908084257_change_attachment_size_fields_to_bigint.rb +++ b/db/migrate/20200908084257_change_attachment_size_fields_to_bigint.rb @@ -1,7 +1,13 @@ class ChangeAttachmentSizeFieldsToBigint < ActiveRecord::Migration[5.1] - def change + def up change_column :site_customization_images, :image_file_size, :bigint change_column :images, :attachment_file_size, :bigint change_column :documents, :attachment_file_size, :bigint end + + def down + change_column :site_customization_images, :image_file_size, :integer + change_column :images, :attachment_file_size, :integer + change_column :documents, :attachment_file_size, :integer + end end From 7c8581d74e4cce59950adcffd87ec0dc81d04c03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:32:46 +0000 Subject: [PATCH 02/16] Bump audited from 5.0.1 to 5.0.2 Bumps [audited](https://github.com/collectiveidea/audited) from 5.0.1 to 5.0.2. - [Release notes](https://github.com/collectiveidea/audited/releases) - [Changelog](https://github.com/collectiveidea/audited/blob/master/CHANGELOG.md) - [Commits](https://github.com/collectiveidea/audited/compare/v5.0.1...v5.0.2) --- updated-dependencies: - dependency-name: audited dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3624ccdcc42f..6e4918d5ebf6 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem "acts_as_votable", "~> 0.13.2" gem "ahoy_matey", "~> 3.2.0" gem "airbrake", "~> 11.0.3" gem "ancestry", "~> 4.2.0" -gem "audited", "~> 5.0.1" +gem "audited", "~> 5.0.2" gem "autoprefixer-rails", "~> 8.2.0" gem "cancancan", "~> 3.3.0" gem "caxlsx", "~> 3.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index d6a4c7478797..3d2e804016c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,8 +79,8 @@ GEM ancestry (4.2.0) activerecord (>= 5.2.6) ast (2.4.2) - audited (5.0.1) - activerecord (>= 5.0, < 6.2) + audited (5.0.2) + activerecord (>= 5.0, < 7.1) autoprefixer-rails (8.2.0) execjs babel-source (5.8.35) @@ -709,7 +709,7 @@ DEPENDENCIES ahoy_matey (~> 3.2.0) airbrake (~> 11.0.3) ancestry (~> 4.2.0) - audited (~> 5.0.1) + audited (~> 5.0.2) autoprefixer-rails (~> 8.2.0) bullet (~> 6.1.4) byebug (~> 11.1.3) From 6038af9216dc303182b7497c0fee98f5a2af4943 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:36:38 +0000 Subject: [PATCH 03/16] Bump webdrivers from 4.6.0 to 4.7.0 Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.6.0 to 4.7.0. - [Release notes](https://github.com/titusfortner/webdrivers/releases) - [Changelog](https://github.com/titusfortner/webdrivers/blob/main/CHANGELOG.md) - [Commits](https://github.com/titusfortner/webdrivers/compare/v4.6.0...v4.7.0) --- updated-dependencies: - dependency-name: webdrivers dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6e4918d5ebf6..7b9a49038ecc 100644 --- a/Gemfile +++ b/Gemfile @@ -89,7 +89,7 @@ group :test do gem "email_spec", "~> 2.2.0" gem "rspec-rails", "~> 5.0" gem "selenium-webdriver", "~> 3.142" - gem "webdrivers", "~> 4.6.0" + gem "webdrivers", "~> 4.7.0" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 3d2e804016c1..7d425a1cd137 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -683,10 +683,10 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (4.6.0) + webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) + selenium-webdriver (> 3.141, < 5.0) webrick (1.7.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) @@ -801,7 +801,7 @@ DEPENDENCIES uuidtools (~> 2.1.5) view_component (~> 2.69.0) web-console (~> 4.0.4) - webdrivers (~> 4.6.0) + webdrivers (~> 4.7.0) whenever (~> 1.0.0) wicked_pdf (~> 2.6.3) wkhtmltopdf-binary (~> 0.12.6) From ca8ccef27df30958ed87ebb4f6c23d062cc7dc8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:36:23 +0000 Subject: [PATCH 04/16] Bump jquery-rails from 4.4.0 to 4.5.0 Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/rails/jquery-rails/releases) - [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/jquery-rails/compare/v4.4.0...v4.5.0) --- updated-dependencies: - dependency-name: jquery-rails dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6e4918d5ebf6..d6425d914e0e 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem "image_processing", "~> 1.12.2" gem "initialjs-rails", "~> 0.2.0.9" gem "invisible_captcha", "~> 2.0.0" gem "jquery-fileupload-rails" -gem "jquery-rails", "~> 4.4.0" +gem "jquery-rails", "~> 4.5.0" gem "jquery-ui-rails", "~> 6.0.1" gem "kaminari", "~> 1.2.2" gem "mini_magick", "~> 4.11.0" diff --git a/Gemfile.lock b/Gemfile.lock index 3d2e804016c1..0f67acde4617 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -334,7 +334,7 @@ GEM actionpack (>= 3.1) railties (>= 3.1) sassc - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -750,7 +750,7 @@ DEPENDENCIES initialjs-rails (~> 0.2.0.9) invisible_captcha (~> 2.0.0) jquery-fileupload-rails - jquery-rails (~> 4.4.0) + jquery-rails (~> 4.5.0) jquery-ui-rails (~> 6.0.1) kaminari (~> 1.2.2) knapsack_pro (~> 3.3.1) From 8b6d7bfa446e70a9687a98c3e172b26de9130cdf Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 26 Aug 2022 13:29:17 +0200 Subject: [PATCH 05/16] Remove unused translations --- config/locales/es/community.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/locales/es/community.yml b/config/locales/es/community.yml index c6e63a904a9a..fdb29a224879 100644 --- a/config/locales/es/community.yml +++ b/config/locales/es/community.yml @@ -25,10 +25,6 @@ es: topic: edit: Editar tema destroy: Eliminar tema - comments: - zero: Sin comentarios - one: 1 Comentario - other: "%{count} Comentarios" author: Autor back: Volver a %{community} %{proposal} topic: From 342a0fd97ea38325bbabcecc771d7ccd155ad1e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:35:39 +0000 Subject: [PATCH 06/16] Bump i18n-tasks from 0.9.34 to 0.9.37 Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.34 to 0.9.37. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.34...v0.9.37) --- updated-dependencies: - dependency-name: i18n-tasks dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index baf4015984dd..7d9a86d0330e 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,7 @@ group :development, :test do gem "byebug", "~> 11.1.3" gem "factory_bot_rails", "~> 6.2.0" gem "faker", "~> 2.18.0" - gem "i18n-tasks", "~> 0.9.34" + gem "i18n-tasks", "~> 0.9.37" gem "knapsack_pro", "~> 3.3.1" gem "launchy", "~> 2.5.0" gem "letter_opener_web", "~> 2.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index 6d9ba07415eb..52c6769d9058 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,7 +312,7 @@ GEM socksify i18n (1.12.0) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.34) + i18n-tasks (0.9.37) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -443,7 +443,7 @@ GEM parallel (1.20.1) paranoia (2.4.3) activerecord (>= 4.0, < 6.2) - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) pg (1.4.3) pg_search (2.3.6) @@ -513,7 +513,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) @@ -616,7 +616,7 @@ GEM simplecov-html (0.10.2) sitemap_generator (6.3.0) builder (~> 3.0) - smart_properties (1.15.0) + smart_properties (1.17.0) social-share-button (1.2.4) coffee-rails socksify (1.7.1) @@ -665,7 +665,7 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.7.0) + unicode-display_width (2.2.0) uniform_notifier (1.14.2) uuidtools (2.1.5) view_component (2.69.0) @@ -745,7 +745,7 @@ DEPENDENCIES graphiql-rails (~> 1.7.0) graphql (~> 1.12.14) groupdate (~> 6.1.0) - i18n-tasks (~> 0.9.34) + i18n-tasks (~> 0.9.37) image_processing (~> 1.12.2) initialjs-rails (~> 0.2.0.9) invisible_captcha (~> 2.0.0) From bf3fdf151e4581416dee75649f433e9afbdcbad2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:36:08 +0000 Subject: [PATCH 07/16] Bump rspec-rails from 5.0.1 to 5.1.2 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.0.1 to 5.1.2. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.1...v5.1.2) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index baf4015984dd..bf8fa3043446 100644 --- a/Gemfile +++ b/Gemfile @@ -87,7 +87,7 @@ group :test do gem "capybara-webmock", "~> 0.6.0" gem "coveralls", "~> 0.8.23", require: false gem "email_spec", "~> 2.2.0" - gem "rspec-rails", "~> 5.0" + gem "rspec-rails", "~> 5.1.2" gem "selenium-webdriver", "~> 3.142" gem "webdrivers", "~> 4.7.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 6d9ba07415eb..6ca0cf3c0d84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM warden (~> 1.2.3) devise-security (0.16.0) devise (>= 4.3.0, < 5.0) - diff-lcs (1.4.4) + diff-lcs (1.5.0) docile (1.3.2) dry-configurable (0.7.0) concurrent-ruby (~> 1.0) @@ -531,15 +531,15 @@ GEM retriable (3.1.2) rexml (3.2.5) rinku (2.0.6) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.1) + rspec-support (~> 3.11.0) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -547,7 +547,7 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) + rspec-support (3.11.0) rubocop (1.18.4) parallel (~> 1.10) parser (>= 3.0.0.0) @@ -779,7 +779,7 @@ DEPENDENCIES redcarpet (~> 3.5.1) responders (~> 3.0.1) rinku (~> 2.0.6) - rspec-rails (~> 5.0) + rspec-rails (~> 5.1.2) rubocop (~> 1.18.4) rubocop-performance (~> 1.11.4) rubocop-rails (~> 2.15.2) From ae6e0a4ddb567b6380f76790e18aa6b51adf54f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Aug 2022 15:16:41 +0200 Subject: [PATCH 08/16] Fix Gemfile.lock We accidentally introduced a dependency incompatibility in commit 342a0fd97. For some reason, Bundler didn't detect it immediately on either my machine or our CI. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 90323d6cd30b..52a8249cfbcf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -665,7 +665,7 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.2.0) + unicode-display_width (1.7.0) uniform_notifier (1.14.2) uuidtools (2.1.5) view_component (2.69.0) From 8a64009d7f7d325c8a3bd0e2fb02849994d35d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Aug 2022 15:10:41 +0200 Subject: [PATCH 09/16] Bump paranoia from 2.4.3 to 2.6.0 Bumps [paranoia](https://github.com/rubysherpas/paranoia) from 2.4.3 to 2.6.0. - [Release notes](https://github.com/rubysherpas/paranoia/releases) - [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md) - [Commits](https://github.com/rubysherpas/paranoia/compare/2.4.3...v2.6.0) --- updated-dependencies: - dependency-name: paranoia dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index c5523b9fedc0..1443d34c6717 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem "omniauth-facebook", "~> 8.0.0" gem "omniauth-google-oauth2", "~> 1.0.0" gem "omniauth-rails_csrf_protection", "~> 1.0.0" gem "omniauth-twitter", "~> 1.4.0" -gem "paranoia", "~> 2.4.3" +gem "paranoia", "~> 2.6.0" gem "pg", "~> 1.4.3" gem "pg_search", "~> 2.3.6" gem "puma", "~> 4.3.12" diff --git a/Gemfile.lock b/Gemfile.lock index 52a8249cfbcf..f629683804fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -441,8 +441,8 @@ GEM rack orm_adapter (0.5.0) parallel (1.20.1) - paranoia (2.4.3) - activerecord (>= 4.0, < 6.2) + paranoia (2.6.0) + activerecord (>= 5.1, < 7.1) parser (3.1.2.1) ast (~> 2.4.1) pg (1.4.3) @@ -763,7 +763,7 @@ DEPENDENCIES omniauth-google-oauth2 (~> 1.0.0) omniauth-rails_csrf_protection (~> 1.0.0) omniauth-twitter (~> 1.4.0) - paranoia (~> 2.4.3) + paranoia (~> 2.6.0) pg (~> 1.4.3) pg_search (~> 2.3.6) pronto (~> 0.11.0) From d60860e02a553970fd6978b2da5dc4dd93b4efc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:34:39 +0000 Subject: [PATCH 10/16] Bump recipient_interceptor from 0.3.0 to 0.3.1 Bumps [recipient_interceptor](https://github.com/croaky/recipient_interceptor) from 0.3.0 to 0.3.1. - [Release notes](https://github.com/croaky/recipient_interceptor/releases) - [Commits](https://github.com/croaky/recipient_interceptor/compare/v0.3.0...v0.3.1) --- updated-dependencies: - dependency-name: recipient_interceptor dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1443d34c6717..4392d412b802 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,7 @@ gem "paranoia", "~> 2.6.0" gem "pg", "~> 1.4.3" gem "pg_search", "~> 2.3.6" gem "puma", "~> 4.3.12" -gem "recipient_interceptor", "~> 0.3.0" +gem "recipient_interceptor", "~> 0.3.1" gem "redcarpet", "~> 3.5.1" gem "responders", "~> 3.0.1" gem "rinku", "~> 2.0.6", require: "rails_rinku" diff --git a/Gemfile.lock b/Gemfile.lock index f629683804fd..9a0c374015ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -519,7 +519,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbtree3 (0.6.0) - recipient_interceptor (0.3.0) + recipient_interceptor (0.3.1) mail redcarpet (3.5.1) regexp_parser (2.5.0) @@ -775,7 +775,7 @@ DEPENDENCIES rails (= 6.0.5.1) rails-assets-leaflet! rails-assets-markdown-it (~> 9.0.1)! - recipient_interceptor (~> 0.3.0) + recipient_interceptor (~> 0.3.1) redcarpet (~> 3.5.1) responders (~> 3.0.1) rinku (~> 2.0.6) From 59a76a8caf1e2290ea510cf3c0fc897fa3ed7b1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:31:50 +0000 Subject: [PATCH 11/16] Bump faker from 2.18.0 to 2.22.0 Bumps [faker](https://github.com/faker-ruby/faker) from 2.18.0 to 2.22.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.18.0...v2.22.0) --- updated-dependencies: - dependency-name: faker dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 1443d34c6717..9bded212ba80 100644 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,7 @@ group :development, :test do gem "bullet", "~> 6.1.4" gem "byebug", "~> 11.1.3" gem "factory_bot_rails", "~> 6.2.0" - gem "faker", "~> 2.18.0" + gem "faker", "~> 2.22.0" gem "i18n-tasks", "~> 0.9.37" gem "knapsack_pro", "~> 3.3.1" gem "launchy", "~> 2.5.0" diff --git a/Gemfile.lock b/Gemfile.lock index f629683804fd..060418885aa5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,8 +234,8 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (2.18.0) - i18n (>= 1.6, < 2) + faker (2.22.0) + i18n (>= 1.8.11, < 2) faraday (1.7.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -734,7 +734,7 @@ DEPENDENCIES email_spec (~> 2.2.0) erb_lint (~> 0.0.37) factory_bot_rails (~> 6.2.0) - faker (~> 2.18.0) + faker (~> 2.22.0) file_validators (~> 3.0.0) font-awesome-sass (~> 5.15.1) foundation-rails (~> 6.6.2.0) From ae2929344436bc1e5bb86b094455c8db3e837497 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:33:44 +0000 Subject: [PATCH 12/16] Bump bullet from 6.1.4 to 7.0.3 Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.4 to 7.0.3. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.1.4...7.0.3) --- updated-dependencies: - dependency-name: bullet dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 14d7e077e718..119dec0d75f7 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ source "https://rails-assets.org" do end group :development, :test do - gem "bullet", "~> 6.1.4" + gem "bullet", "~> 7.0.3" gem "byebug", "~> 11.1.3" gem "factory_bot_rails", "~> 6.2.0" gem "faker", "~> 2.22.0" diff --git a/Gemfile.lock b/Gemfile.lock index 695e7248c1a9..e81027c13ba6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,7 +98,7 @@ GEM smart_properties bindex (0.8.1) builder (3.2.4) - bullet (6.1.4) + bullet (7.0.3) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -666,7 +666,7 @@ GEM uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.7.0) - uniform_notifier (1.14.2) + uniform_notifier (1.16.0) uuidtools (2.1.5) view_component (2.69.0) activesupport (>= 5.0.0, < 8.0) @@ -711,7 +711,7 @@ DEPENDENCIES ancestry (~> 4.2.0) audited (~> 5.0.2) autoprefixer-rails (~> 8.2.0) - bullet (~> 6.1.4) + bullet (~> 7.0.3) byebug (~> 11.1.3) cancancan (~> 3.3.0) capistrano (~> 3.17.1) From fde6b007f9d53e9420abfaadf584acf9c0b9e6db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:33:58 +0000 Subject: [PATCH 13/16] Bump delayed_job_active_record from 4.1.6 to 4.1.7 Bumps [delayed_job_active_record](https://github.com/collectiveidea/delayed_job_active_record) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/collectiveidea/delayed_job_active_record/releases) - [Commits](https://github.com/collectiveidea/delayed_job_active_record/compare/v4.1.6...v4.1.7) --- updated-dependencies: - dependency-name: delayed_job_active_record dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 119dec0d75f7..7630028e3c22 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem "ckeditor", "~> 4.3.0" gem "cocoon", "~> 1.2.15" gem "daemons", "~> 1.4.1" gem "dalli", "~> 2.7.11" -gem "delayed_job_active_record", "~> 4.1.6" +gem "delayed_job_active_record", "~> 4.1.7" gem "devise", "~> 4.8.0" gem "devise-security", "~> 0.16.0" gem "file_validators", "~> 3.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index e81027c13ba6..5d4eb7e61b38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,10 +169,10 @@ GEM crass (1.0.6) daemons (1.4.1) dalli (2.7.11) - delayed_job (4.1.9) - activesupport (>= 3.0, < 6.2) - delayed_job_active_record (4.1.6) - activerecord (>= 3.0, < 6.2) + delayed_job (4.1.10) + activesupport (>= 3.0, < 8.0) + delayed_job_active_record (4.1.7) + activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) device_detector (1.0.5) devise (4.8.0) @@ -728,7 +728,7 @@ DEPENDENCIES coveralls (~> 0.8.23) daemons (~> 1.4.1) dalli (~> 2.7.11) - delayed_job_active_record (~> 4.1.6) + delayed_job_active_record (~> 4.1.7) devise (~> 4.8.0) devise-security (~> 0.16.0) email_spec (~> 2.2.0) From b039eaf004731474eb3e06e228fb3054e7dbb95a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:33:31 +0000 Subject: [PATCH 14/16] Bump web-console from 4.0.4 to 4.2.0 Bumps [web-console](https://github.com/rails/web-console) from 4.0.4 to 4.2.0. - [Release notes](https://github.com/rails/web-console/releases) - [Changelog](https://github.com/rails/web-console/blob/master/CHANGELOG.markdown) - [Commits](https://github.com/rails/web-console/compare/v4.0.4...v4.2.0) --- updated-dependencies: - dependency-name: web-console dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 119dec0d75f7..3ada00cd91e9 100644 --- a/Gemfile +++ b/Gemfile @@ -112,7 +112,7 @@ group :development do gem "rubocop-rspec", "~> 2.4.0", require: false gem "rvm1-capistrano3", "~> 1.4.0", require: false gem "scss_lint", "~> 0.59.0", require: false - gem "web-console", "~> 4.0.4" + gem "web-console", "~> 4.2.0" end eval_gemfile "./Gemfile_custom" diff --git a/Gemfile.lock b/Gemfile.lock index e81027c13ba6..6b9f490d0754 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -678,7 +678,7 @@ GEM addressable httpi (~> 2.0) nokogiri (>= 1.4.2) - web-console (4.0.4) + web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) @@ -800,7 +800,7 @@ DEPENDENCIES uglifier (~> 4.2.0) uuidtools (~> 2.1.5) view_component (~> 2.69.0) - web-console (~> 4.0.4) + web-console (~> 4.2.0) webdrivers (~> 4.7.0) whenever (~> 1.0.0) wicked_pdf (~> 2.6.3) From 3ea8b590586a179b6e63ac37b55021a9766f2886 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:34:25 +0000 Subject: [PATCH 15/16] Bump globalize from 6.0.1 to 6.2.1 Bumps [globalize](https://github.com/globalize/globalize) from 6.0.1 to 6.2.1. - [Release notes](https://github.com/globalize/globalize/releases) - [Changelog](https://github.com/globalize/globalize/blob/main/CHANGELOG.md) - [Commits](https://github.com/globalize/globalize/commits/v6.2.1) --- updated-dependencies: - dependency-name: globalize dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 3624ccdcc42f..3abdb43a37c2 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem "file_validators", "~> 3.0.0" gem "font-awesome-sass", "~> 5.15.1" # Remember to update vendor/assets/images/fontawesome when updating this gem gem "foundation-rails", "~> 6.6.2.0" gem "foundation_rails_helper", "~> 4.0.1" -gem "globalize", "~> 6.0.1" +gem "globalize", "~> 6.2.1" gem "globalize-accessors", "~> 0.3.0" gem "graphiql-rails", "~> 1.7.0" gem "graphql", "~> 1.12.14" diff --git a/Gemfile.lock b/Gemfile.lock index d6a4c7478797..e75d1c207cc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -286,9 +286,9 @@ GEM terminal-table (~> 1.5, >= 1.5.1) globalid (1.0.0) activesupport (>= 5.0) - globalize (6.0.1) - activemodel (>= 4.2, < 7.0) - activerecord (>= 4.2, < 7.0) + globalize (6.2.1) + activemodel (>= 4.2, < 7.1) + activerecord (>= 4.2, < 7.1) request_store (~> 1.0) globalize-accessors (0.3.0) globalize (>= 5.0.0) @@ -523,7 +523,7 @@ GEM mail redcarpet (3.5.1) regexp_parser (2.5.0) - request_store (1.5.0) + request_store (1.5.1) rack (>= 1.4) responders (3.0.1) actionpack (>= 5.0) @@ -740,7 +740,7 @@ DEPENDENCIES foundation-rails (~> 6.6.2.0) foundation_rails_helper (~> 4.0.1) github_changelog_generator (~> 1.15.2) - globalize (~> 6.0.1) + globalize (~> 6.2.1) globalize-accessors (~> 0.3.0) graphiql-rails (~> 1.7.0) graphql (~> 1.12.14) From 226d576381aa8ba363267852294038cb05a35b34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 22:35:17 +0000 Subject: [PATCH 16/16] Bump airbrake from 11.0.3 to 13.0.2 Bumps [airbrake](https://github.com/airbrake/airbrake) from 11.0.3 to 13.0.2. - [Release notes](https://github.com/airbrake/airbrake/releases) - [Changelog](https://github.com/airbrake/airbrake/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbrake/airbrake/compare/v11.0.3...v13.0.2) --- updated-dependencies: - dependency-name: airbrake dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index fbf9fd325df4..415e12b6bda7 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem "rails", "6.0.5.1" gem "acts-as-taggable-on", "~> 9.0.1" gem "acts_as_votable", "~> 0.13.2" gem "ahoy_matey", "~> 3.2.0" -gem "airbrake", "~> 11.0.3" +gem "airbrake", "~> 13.0.2" gem "ancestry", "~> 4.2.0" gem "audited", "~> 5.0.2" gem "autoprefixer-rails", "~> 8.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index afbb88073ba6..857795206c07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,9 +67,9 @@ GEM device_detector geocoder (>= 1.4.5) safely_block (>= 0.2.1) - airbrake (11.0.3) - airbrake-ruby (~> 5.1) - airbrake-ruby (5.2.1) + airbrake (13.0.2) + airbrake-ruby (~> 6.0) + airbrake-ruby (6.1.1) rbtree3 (~> 0.5) airbrussh (1.4.1) sshkit (>= 1.6.1, != 1.7.0) @@ -518,7 +518,7 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rbtree3 (0.6.0) + rbtree3 (0.7.0) recipient_interceptor (0.3.1) mail redcarpet (3.5.1) @@ -707,7 +707,7 @@ DEPENDENCIES acts-as-taggable-on (~> 9.0.1) acts_as_votable (~> 0.13.2) ahoy_matey (~> 3.2.0) - airbrake (~> 11.0.3) + airbrake (~> 13.0.2) ancestry (~> 4.2.0) audited (~> 5.0.2) autoprefixer-rails (~> 8.2.0)