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 version to v1.43.2 #1022

Merged
merged 3 commits into from Aug 25, 2020
Merged

Bump version to v1.43.2 #1022

merged 3 commits into from Aug 25, 2020

Conversation

bquorning
Copy link
Collaborator

@bquorning bquorning commented Aug 25, 2020

As discussed in #1011 (comment), we have a couple of regression fixes that should be released before the next minor (or major) release goes out.

This branch cherry-picks the merge commits of #1009 and #1011 and changes the version number.

This branch will need to be merged into master afterwards, possibly manually (because of CHANGELOG conflicts), but the tagging and releasing will be done from fd7009b before the merge.


Before submitting the PR make sure the following are checked:

  • [-] Feature branch is up-to-date with master (if not - rebase it).
  • Squashed related commits together.
  • [-] Added tests.
  • [-] Updated documentation.
  • Added an entry to the CHANGELOG.md if the new code introduces user-observable changes.
  • The build (bundle exec rake) passes (be sure to run this locally, since it may produce updated documentation that you will need to commit).

Darhazer and others added 3 commits August 24, 2020 21:45
…shared-groups

Skip files with shared groups in RSpec/FilePath
Fix subject nesting detection in RSpec/LeadingSubject
Copy link
Member

@pirj pirj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤯 how it's possible to see this as a pull to master even though it's on master already :D
Thanks!

@bquorning
Copy link
Collaborator Author

Oh no, this branch isn’t based on master. It’s just 3 commits on top of https://github.com/rubocop-hq/rubocop-rspec/tree/v1.43.1

@bquorning
Copy link
Collaborator Author

@pirj
Copy link
Member

pirj commented Aug 25, 2020

This is where my knowledge of git merge commits fails to explain how things are possible.

@bquorning bquorning merged commit f1048eb into master Aug 25, 2020
@bquorning bquorning deleted the 1.43-bugfixes branch August 25, 2020 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants