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

feat(gov): handle panics when executing x/gov proposals (backport #17780) #17790

Merged
merged 2 commits into from
Sep 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 18, 2023

This is an automatic backport of pull request #17780 done by Mergify.
Cherry-pick of a0b39a1 has failed:

On branch mergify/bp/release/v0.50.x/pr-17780
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit a0b39a1d3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   x/gov/abci.go
	new file:   x/gov/abci_internal_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit a0b39a1)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner September 18, 2023 15:09
@mergify mergify bot added the conflicts label Sep 18, 2023
@julienrbrt julienrbrt assigned julienrbrt and unassigned julienrbrt Sep 18, 2023
@github-prbot github-prbot requested review from a team, alexanderbez and tac0turtle and removed request for a team September 18, 2023 15:12
@tac0turtle tac0turtle enabled auto-merge (squash) September 18, 2023 15:13
@tac0turtle tac0turtle merged commit 87ba5a6 into release/v0.50.x Sep 18, 2023
45 of 46 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.50.x/pr-17780 branch September 18, 2023 15:33
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants