Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rubocop from 1.30.1 to 1.48.0 #1976

Open
wants to merge 24 commits into
base: handon-production
Choose a base branch
from

Conversation

dependabot[bot]
Copy link

@dependabot dependabot bot commented on behalf of github Mar 6, 2023

Bumps rubocop from 1.30.1 to 1.48.0.

Release notes

Sourced from rubocop's releases.

RuboCop 1.48

New features

Bug fixes

  • #11654: Fix a false positive for Lint/MissingSuper when no super call and when defining some method. (@​koic)
  • #11661: Fix an error for Style/Documentation when namespace is a variable. (@​koic)
  • #11647: Fix an error for Style/IfWithBooleanLiteralBranches when using () as a condition. (@​koic)
  • #11646: Fix an error for Style/NegatedIfElseCondition when using () as a condition. (@​koic)
  • #11659: Fix an incorrect autocorrect for Lint/OrAssignmentToConstant when using or-assignment to a constant in method definition. (@​koic)
  • #11663: Fix an incorrect autocorrect for Style/BlockDelimiters when multi-line blocks to { and } with arithmetic operation method chain. (@​koic)
  • #11638: Fix a false positive for Lint/UselessAccessModifier when using same access modifier inside and outside the included block. (@​ydah)
  • #11164: Suppress server mode message with -f json. (@​jasondoc3)
  • #11643: Fix incorrect shorthand autocorrections in calls inside parentheses. (@​gsamokovarov)
  • #11650: Style/AccessorGrouping: Fix detection of Sorbet sig {} blocks. (@​issyl0)
  • #11657: Use cop name to check if cop inside registry is enabled. Previously, it was able to cause large memory usage during linting. (@​fatkodima)

Changes

  • #11482: Avoid comment deletion by Style/IfUnlessModifier when the modifier form expression has long comment. (@​nobuyo)
  • #11649: Support MinBranchesCount config for Style/CaseLikeIf cop. (@​fatkodima)

RuboCop 1.47

New features

Bug fixes

  • #11615: Fix a false negative for Lint/MissingSuper when no super call with Class.new block. (@​koic)
  • #11615: Fix a false negative for Lint/MissingSuper when using Class.new without parent class argument. (@​koic)
  • #11040: Fix a false positive for Style/IfUnlessModifier when defined?'s argument value is undefined. (@​koic)
  • #11607: Fix a false positive for Style/RedundantRegexpEscape when an escaped hyphen follows after an escaped opening square bracket within a character class. ([@​SparLaimor][])
  • #11626: Fix a false positive for Style/ZeroLengthPredicate when using File.new(path).size.zero?. (@​koic)
  • #11620: Fix an error for Lint/ConstantResolution when using __ENCODING__. (@​koic)
  • #11625: Fix an error for Lint/EmptyConditionalBody when missing if body and using method call for return value. (@​koic)
  • #11631: Fix an incorrect autocorrect for Style/ArgumentsForwarding when using arguments forwarding for .() call. (@​koic)
  • #11621: Fix an incorrect autocorrect for Layout/ClassStructure using heredoc inside method. (@​fatkodima)

... (truncated)

Changelog

Sourced from rubocop's changelog.

1.48.0 (2023-03-06)

New features

Bug fixes

  • #11654: Fix a false positive for Lint/MissingSuper when no super call and when defining some method. ([@​koic][])
  • #11661: Fix an error for Style/Documentation when namespace is a variable. ([@​koic][])
  • #11647: Fix an error for Style/IfWithBooleanLiteralBranches when using () as a condition. ([@​koic][])
  • #11646: Fix an error for Style/NegatedIfElseCondition when using () as a condition. ([@​koic][])
  • #11659: Fix an incorrect autocorrect for Lint/OrAssignmentToConstant when using or-assignment to a constant in method definition. ([@​koic][])
  • #11663: Fix an incorrect autocorrect for Style/BlockDelimiters when multi-line blocks to { and } with arithmetic operation method chain. ([@​koic][])
  • #11638: Fix a false positive for Lint/UselessAccessModifier when using same access modifier inside and outside the included block. ([@​ydah][])
  • #11164: Suppress server mode message with -f json. ([@​jasondoc3][])
  • #11643: Fix incorrect shorthand autocorrections in calls inside parentheses. ([@​gsamokovarov][])
  • #11650: Style/AccessorGrouping: Fix detection of Sorbet sig {} blocks. ([@​issyl0][])
  • #11657: Use cop name to check if cop inside registry is enabled. Previously, it was able to cause large memory usage during linting. ([@​fatkodima][])

Changes

  • #11482: Avoid comment deletion by Style/IfUnlessModifier when the modifier form expression has long comment. ([@​nobuyo][])
  • #11649: Support MinBranchesCount config for Style/CaseLikeIf cop. ([@​fatkodima][])

1.47.0 (2023-03-01)

New features

Bug fixes

  • #11615: Fix a false negative for Lint/MissingSuper when no super call with Class.new block. ([@​koic][])
  • #11615: Fix a false negative for Lint/MissingSuper when using Class.new without parent class argument. ([@​koic][])
  • #11040: Fix a false positive for Style/IfUnlessModifier when defined?'s argument value is undefined. ([@​koic][])
  • #11607: Fix a false positive for Style/RedundantRegexpEscape when an escaped hyphen follows after an escaped opening square bracket within a character class. ([@​SparLaimor][])
  • #11626: Fix a false positive for Style/ZeroLengthPredicate when using File.new(path).size.zero?. ([@​koic][])
  • #11620: Fix an error for Lint/ConstantResolution when using __ENCODING__. ([@​koic][])
  • #11625: Fix an error for Lint/EmptyConditionalBody when missing if body and using method call for return value. ([@​koic][])
  • #11631: Fix an incorrect autocorrect for Style/ArgumentsForwarding when using arguments forwarding for .() call. ([@​koic][])
  • #11621: Fix an incorrect autocorrect for Layout/ClassStructure using heredoc inside method. ([@​fatkodima][])
  • #3591: Handle modifier while and until expressions in Lint/UselessAssignment. ([@​bfad][])
  • #11202: Fixed usage of --only flag with --auto-gen-config. ([@​istvanfazakas][])

Changes

  • #11623: Add rubocop-capybara to suggested extensions and extension doc. ([@​ydah][])

... (truncated)

Commits
  • 8d32826 Cut 1.48
  • 36cc776 Update Changelog
  • af8b5f9 [Fix #11164] Suppress server mode message with -f json (#11668)
  • 8257ff2 [Fix #11629] Add new Style/FileEmpty cop
  • f23e487 Cache classname_attribute_value in junit formatter
  • 0499a58 [Fix #11628] Add new Style/DirEmpty cop
  • f982aa8 [Fix #11663] Fix an incorrect autocorrect for Style/BlockDelimiters
  • d8f6765 Merge pull request #11665 from fatkodima/registry-enabled-cop-name
  • 118542b Merge pull request #11638 from ydah/fix-lint_useless_access_modifier
  • 0d3c056 Fix a false positive for Lint/UselessAccessModifier when using same access ...
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

highemerly and others added 24 commits November 17, 2022 23:42
- 検索クエリを分かち書きを行わない言語に最適化
- 形態素解析を行うためにElasticsearch側にkuromojiを導入
- 検索結果をマッチ度順ではなく日付順に変更

Conflicts:
	app/chewy/statuses_index.rb
- 投票作成時,その選択肢の数の上限を4から16に変更
- 投票作成時,その有効期限をより細かく設定出来るように変更
- Announcement機能をマージ(lindwurm/mastodon)

Conflicts:
	app/javascript/mastodon/components/status.js
[Fix] InstanceTickerを有効にしても自インスタンスではティッカーを表示しない設定を通知欄にも適用

- InstanceTickerを有効にするテーマの場合,はんドンクラブのティッカーは非表示にしていた
- これまでは適用範囲がHTL/FTL/LTLのみだったが,今回それに加えてnotificationも追加した

[Change] InstanceTickerのURL変更に対応

InstanceTicker/InstanceTicker#11
- ユニークユーザ5人以上で選出されるものを3人以上で選出されるよう変更

Conflicts:
	app/models/trending_tags.rb
- カスタム絵文字としてユーザのアイコンが使える機能
- 対象はトゥート,投票の選択肢,お知らせ,アカウントプロフィール欄
- 自サーバの人が他サーバのアカウントのプロフィール絵文字を使うことはできる
- 他サーバの人がプロフィール絵文字を使うことはできない
- 3.3.0からHTL上にDMを表示するようになった
- きもちわるいので3.2.x以前の表示に戻すオプションをつくり,かつそれを初期値に設定した

Conflicts:
	config/locales/simple_form.en.yml

Conflicts:
	config/locales/simple_form.ja.yml

Conflicts:
	app/lib/feed_manager.rb
	app/services/fan_out_on_write_service.rb

Conflicts:
	app/models/user.rb
	config/locales/simple_form.en.yml

Conflicts:
	config/locales/simple_form.ja.yml
Conflicts:
	app/models/media_attachment.rb
- BlackLeadを追加
- CantaDarkを追加
- Mastodonオリジナルのスタイルを復活
Conflicts:
	config/locales/simple_form.en.yml

Conflicts:
	config/locales/simple_form.ja.yml

Conflicts:
	app/javascript/styles/mastodon/accounts.scss
	config/i18n-tasks.yml
- 上級者モードが無効で、かつPC表示の場合に、上部ナビバーのレイアウト崩れが発生していた問題を修正
- 上級者モードが無効で、かつPC表示の場合に、右部ナビバーの投稿ボタンの文言がダミー文字列となっていた問題を修正
- 「Handon」テーマのライトモードにおいて、TL上での公開範囲を表すアイコン色が見づらくなっていたため、色を変更
- 「Handon」テーマのBlackLeadにおいて、通知欄のレイアウト崩れが発生していた問題を修正
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.30.1 to 1.48.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v1.30.1...v1.48.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file ruby Pull requests that update Ruby code labels Mar 6, 2023
@github-actions
Copy link

github-actions bot commented Apr 5, 2023

This pull request has merge conflicts that must be resolved before it can be merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file rebase needed 🚧 ruby Pull requests that update Ruby code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant