From 06c4e9844419326fd80a19f20ec46fce9f4dea07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:20:59 +0000 Subject: [PATCH] Bump the rubocop group across 1 directory with 2 updates (#5405) * Bump the rubocop group across 1 directory with 2 updates Bumps the rubocop group with 2 updates in the / directory: [rubocop](https://github.com/rubocop/rubocop) and [rubocop-rails](https://github.com/rubocop/rubocop-rails). Updates `rubocop` from 1.70.0 to 1.71.0 - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.70.0...v1.71.0) Updates `rubocop-rails` from 2.28.0 to 2.29.0 - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.28.0...v2.29.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor dependency-group: rubocop - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-minor dependency-group: rubocop ... Signed-off-by: dependabot[bot] * RuboCop autocorrect Signed-off-by: Samuel Giddins --------- Signed-off-by: dependabot[bot] Signed-off-by: Samuel Giddins Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Samuel Giddins --- Gemfile | 4 ++-- Gemfile.lock | 20 +++++++++---------- .../onboarding/name_controller.rb | 2 +- .../onboarding/users_controller.rb | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 0d3d1c47729..ab007289f24 100644 --- a/Gemfile +++ b/Gemfile @@ -111,8 +111,8 @@ group :development, :test do gem "pg_query", "~> 6.0" # bundle show | rg rubocop | cut -d' ' -f4 | xargs bundle update - gem "rubocop", "~> 1.70", require: false - gem "rubocop-rails", "~> 2.28", require: false + gem "rubocop", "~> 1.71", require: false + gem "rubocop-rails", "~> 2.29", require: false gem "rubocop-performance", "~> 1.23", require: false gem "rubocop-minitest", "~> 0.35", require: false gem "rubocop-capybara", "~> 2.21", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 38e49b76c57..ef268a3930b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -558,7 +558,7 @@ GEM ostruct (0.6.0) pagy (8.6.3) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc pg (1.5.9) @@ -720,7 +720,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.2) - rubocop (1.70.0) + rubocop (1.71.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -742,7 +742,7 @@ GEM rubocop-performance (1.23.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.28.0) + rubocop-rails (2.29.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) @@ -836,7 +836,7 @@ GEM turbo-rails (>= 1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (3.1.3) + unicode-display_width (3.1.4) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) unpwn (1.0.0) @@ -984,12 +984,12 @@ DEPENDENCIES roadie-rails (~> 3.3) rotp (~> 6.2) rqrcode (~> 2.1) - rubocop (~> 1.70) + rubocop (~> 1.71) rubocop-capybara (~> 2.21) rubocop-factory_bot (~> 2.26) rubocop-minitest (~> 0.35) rubocop-performance (~> 1.23) - rubocop-rails (~> 2.28) + rubocop-rails (~> 2.29) ruby-magic (~> 0.6) searchkick (~> 5.4) selenium-webdriver (~> 4.28) @@ -1219,7 +1219,7 @@ CHECKSUMS ostruct (0.6.0) sha256=3b1736c99f4d985de36bde1155be5e22aaf6e564b30ff9bd481e2ef7c2d9ba85 pagy (8.6.3) sha256=537b2ee3119f237dd6c4a0d0a35c67a77b9d91ebb9d4f85e31407c2686774fb2 parallel (1.26.3) sha256=d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef - parser (3.3.6.0) sha256=25d4e67cc4f0f7cab9a2ae1f38e2005b6904d2ea13c34734511d0faad038bc3b + parser (3.3.7.0) sha256=7449011771e3e7881297859b849de26a6f4fccd515bece9520a87e7d2116119b pg (1.5.9) sha256=761efbdf73b66516f0c26fcbe6515dc7500c3f0aa1a1b853feae245433c64fdc pg_query (6.0.0) sha256=fbf09a4e900cee1d61e2bbfda1fefdbc35bc83c5f1c7ae1be1c6ffc5ae0f5c04 pghero (3.6.1) sha256=e6d4f6ec3979d4828dafcd1eaa4214e70279fe2502b9fe5bd632d8333aa79cd4 @@ -1281,13 +1281,13 @@ CHECKSUMS rspec-expectations (3.13.3) sha256=0e6b5af59b900147698ea0ff80456c4f2e69cac4394fbd392fbd1ca561f66c58 rspec-mocks (3.13.2) sha256=2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef rspec-support (3.13.2) sha256=cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec - rubocop (1.70.0) sha256=96751f8440b36a0ac6e9a8ab596900803118d83d6b83f2037bf8b3d7a5bc440e + rubocop (1.71.0) sha256=e19679efd447346ac476122313d3788ae23c38214790bcf660e984c747608bf0 rubocop-ast (1.37.0) sha256=9513ac88aaf113d04b52912533ffe46475de1362d4aa41141b51b2455827c080 rubocop-capybara (2.21.0) sha256=5d264efdd8b6c7081a3d4889decf1451a1cfaaec204d81534e236bc825b280ab rubocop-factory_bot (2.26.1) sha256=8de13cd4edcee5ca800f255188167ecef8dbfc3d1fae9f15734e9d2e755392aa rubocop-minitest (0.36.0) sha256=1d15850849c685ff4b6d64dd801ec2d13eb2fe56b6f7ce9aab93d1b0508e7b9f rubocop-performance (1.23.1) sha256=f22f86a795f5e6a6180aac2c6fc172534b173a068d6ed3396d6460523e051b82 - rubocop-rails (2.28.0) sha256=4967bed9ea13e6dcab566fea4265a6dd0381db739b305e48930aba1282da2715 + rubocop-rails (2.29.0) sha256=35bffd140c80671453aafac0e2d5ab5b3dd65736a3fc8f3936ccca226b89c234 ruby-graphviz (1.2.5) sha256=1c2bb44e3f6da9e2b829f5e7fd8d75a521485fb6b4d1fc66ff0f93f906121504 ruby-magic (0.6.0) sha256=7b2138877b7d23aff812c95564eba6473b74b815ef85beb0eb792e729a2b6101 ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 @@ -1331,7 +1331,7 @@ CHECKSUMS turbo-rails (2.0.11) sha256=fc47674736372780abd2a4dc0d84bef242f5ca156a457cd7fa6308291e397fcf turbo_power (0.7.0) sha256=ad95d147e0fa761d0023ad9ca00528c7b7ddf6bba8ca2e23755d5b21b290d967 tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b - unicode-display_width (3.1.3) sha256=dbbbb0fddc2941a5d3582d8f991aad6df1defb83741649a07d27cccc4c95c942 + unicode-display_width (3.1.4) sha256=8caf2af1c0f2f07ec89ef9e18c7d88c2790e217c482bfc78aaa65eadd5415ac1 unicode-emoji (4.0.4) sha256=2c2c4ef7f353e5809497126285a50b23056cc6e61b64433764a35eff6c36532a unpwn (1.0.0) sha256=6239d17d46a882b3719b24fb79c78a34caff89d57ab0f5e546be5b5c882bc7d3 uri (1.0.2) sha256=b303504ceb7e5905771fa7fa14b649652fa949df18b5880d69cfb12494791e27 diff --git a/app/controllers/organizations/onboarding/name_controller.rb b/app/controllers/organizations/onboarding/name_controller.rb index c9e4c2c1713..2e08866c6e4 100644 --- a/app/controllers/organizations/onboarding/name_controller.rb +++ b/app/controllers/organizations/onboarding/name_controller.rb @@ -13,6 +13,6 @@ def create private def onboarding_name_params - params.require(:organization_onboarding).permit(:organization_name, :organization_handle) + params.expect(organization_onboarding: %i[organization_name organization_handle]) end end diff --git a/app/controllers/organizations/onboarding/users_controller.rb b/app/controllers/organizations/onboarding/users_controller.rb index a1431ee24bd..eae2568920c 100644 --- a/app/controllers/organizations/onboarding/users_controller.rb +++ b/app/controllers/organizations/onboarding/users_controller.rb @@ -20,6 +20,6 @@ def role_options helper_method :role_options def onboarding_user_params - params.require(:organization_onboarding).permit(invites_attributes: %i[id role]) + params.expect(organization_onboarding: [invites_attributes: [%i[id role]]]) end end