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.26.0 to 1.26.1 #17891

Merged
merged 1 commit into from
Mar 29, 2022
Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 28, 2022

Bumps rubocop from 1.26.0 to 1.26.1.

Release notes

Sourced from rubocop's releases.

RuboCop 1.26.1

Bug fixes

  • #10375: Fix error for auto-correction of unless/else nested inside each other. (@​jonas054)
  • #10457: Make Style/SelectByRegexp aware of ENV const. (@​koic)
  • #10462: Fix an incorrect autocorrect for Lint/SymbolConversion when using a quoted symbol key with hash rocket. (@​koic)
  • #10456: Fix a false positive for Layout/MultilineMethodCallIndentation when using EnforcedStyle: indented with indented assignment method. (@​koic)
  • #10459: Fix a false positive for Layout/LineLength when long URIs in yardoc comments to have titles. (@​ydah)
  • #10447: Fix an error for Style/SoleNestedConditional raises exception when inspecting if ... end if .... (@​ydah)
Changelog

Sourced from rubocop's changelog.

1.26.1 (2022-03-22)

Bug fixes

  • #10375: Fix error for auto-correction of unless/else nested inside each other. ([@​jonas054][])
  • #10457: Make Style/SelectByRegexp aware of ENV const. ([@​koic][])
  • #10462: Fix an incorrect autocorrect for Lint/SymbolConversion when using a quoted symbol key with hash rocket. ([@​koic][])
  • #10456: Fix a false positive for Layout/MultilineMethodCallIndentation when using EnforcedStyle: indented with indented assignment method. ([@​koic][])
  • #10459: Fix a false positive for Layout/LineLength when long URIs in yardoc comments to have titles. ([@​ydah][])
  • #10447: Fix an error for Style/SoleNestedConditional raises exception when inspecting if ... end if .... ([@​ydah][])
Commits
  • f691b9e Cut 1.26.1
  • 036baf2 Update Changelog
  • 6c10b64 [Fix #10374] Fix a false positive for Layout/LineLength when long URIs in y...
  • 5234ad4 [Fix #10462] Fix an incorrect autocorrect for Lint/SymbolConversion
  • 3112ce7 Merge pull request #10457 from koic/make_style_select_by_regexp_aware_of_env_...
  • b901a9f Merge pull request #10461 from jonas054/10375_fix_unless_else_autocorrect
  • ef61df5 Merge pull request #10458 from koic/fix_false_positive_for_layout_multiline_m...
  • 6915fd3 [Fix #10375] Defer auto-correction of nested unless/else
  • 30f8583 [Fix #10456] Fix a false positive for Layout/MultilineMethodCallIndentation
  • 170d3ea Make Style/SelectByRegexp aware of ENV const
  • 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)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file ruby Pull requests that update Ruby code labels Mar 28, 2022
@ykzts
Copy link
Member

ykzts commented Mar 29, 2022

@dependabot rebase

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.26.0 to 1.26.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v1.26.0...v1.26.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/bundler/rubocop-1.26.1 branch from bd7cce9 to b9b5bed Compare March 29, 2022 09:49
@ykzts ykzts merged commit 22c19ee into main Mar 29, 2022
@dependabot dependabot bot deleted the dependabot/bundler/rubocop-1.26.1 branch March 29, 2022 09:58
koba-lab added a commit to koba-lab/mastodon that referenced this pull request Apr 12, 2022
* commit '8c7223f4eac80b5725485be742d3fa2c984f4670': (887 commits)
  Bump version to 3.5.0 (mastodon#17911)
  Fix being able to post URLs longer than 4096 characters (mastodon#17908)
  Fix being able to bypass e-mail restrictions (mastodon#17909)
  Revert "Split build image actions (mastodon#17793)" (mastodon#17907)
  Refactor `response_to_recipient?` CTE (mastodon#17899)
  Fix regression of status colors in actions modal in web UI (mastodon#17903)
  caniuse-lite: add hash sum (mastodon#17902)
  Bump rubocop from 1.26.0 to 1.26.1 (mastodon#17891)
  Bump capistrano from 3.16.0 to 3.17.0 (mastodon#17774)
  Bump concurrent-ruby from 1.1.9 to 1.1.10 (mastodon#17889)
  Bump babel-loader from 8.2.3 to 8.2.4 (mastodon#17894)
  Bump @testing-library/jest-dom from 5.16.2 to 5.16.3 (mastodon#17895)
  Bump prettier from 2.6.0 to 2.6.1 (mastodon#17893)
  Bump devise-two-factor from 4.0.1 to 4.0.2 (mastodon#17892)
  Bump yargs from 17.3.1 to 17.4.0 (mastodon#17834)
  New Crowdin updates (mastodon#17864)
  Fix /api/v1/admin/accounts (mastodon#17887)
  Split build image actions (mastodon#17793)
  Fix test-related issues (mastodon#17888)
  Add `SMTP_RETURN_PATH` environment variable to set bounce domain (mastodon#17886)
  ...

# Conflicts:
#	.circleci/config.yml
#	.github/CODEOWNERS
#	.github/workflows/build-image.yml
#	CHANGELOG.md
#	Dockerfile
#	Gemfile.lock
#	README.md
#	app/controllers/admin/statuses_controller.rb
#	app/controllers/auth/sessions_controller.rb
#	app/controllers/concerns/sign_in_token_authentication_concern.rb
#	app/controllers/concerns/two_factor_authentication_concern.rb
#	app/helpers/context_helper.rb
#	app/javascript/mastodon/features/directory/index.js
#	app/javascript/mastodon/features/followers/index.js
#	app/javascript/mastodon/features/following/index.js
#	app/javascript/mastodon/features/ui/components/video_modal.js
#	app/javascript/mastodon/features/ui/containers/modal_container.js
#	app/javascript/mastodon/features/ui/index.js
#	app/javascript/mastodon/locales/ja.json
#	app/javascript/mastodon/reducers/modal.js
#	app/lib/activitypub/activity/create.rb
#	app/lib/formatter.rb
#	app/models/account.rb
#	app/services/notify_service.rb
#	app/services/resolve_account_service.rb
#	app/validators/status_length_validator.rb
#	app/views/admin/dashboard/index.html.haml
#	app/views/admin/instances/_instance.html.haml
#	app/views/admin/reports/show.html.haml
#	app/views/admin/tags/_tag.html.haml
#	app/views/directories/index.html.haml
#	config/brakeman.ignore
#	config/initializers/twitter_regex.rb
#	db/schema.rb
#	docker-compose.yml
#	lib/mastodon/version.rb
#	lib/tasks/tests.rake
#	package.json
#	spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
#	spec/controllers/api/v1/accounts/notes_controller_spec.rb
#	spec/controllers/follower_accounts_controller_spec.rb
#	spec/controllers/following_accounts_controller_spec.rb
#	spec/models/account_spec.rb
#	spec/models/status_spec.rb
#	spec/services/notify_service_spec.rb
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 ruby Pull requests that update Ruby code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant