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

chore: change prepare and process proposal to be NoOps by default (backport #16407) #16410

Merged
merged 3 commits into from
Jun 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2023

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

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

You are currently cherry-picking commit efdc955ad.
  (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:   docs/docs/building-apps/02-app-mempool.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   baseapp/abci_utils.go

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

…6407)

Co-authored-by: Sergio Mena <sergio@informal.systems>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit efdc955)

# Conflicts:
#	baseapp/abci_utils.go
@mergify mergify bot requested a review from a team as a code owner June 2, 2023 14:49
@mergify mergify bot added the conflicts label Jun 2, 2023
@julienrbrt julienrbrt merged commit ba2f1be into release/v0.47.x Jun 2, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-16407 branch June 2, 2023 15:49
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
kakysha pushed a commit to InjectiveLabs/cosmos-sdk that referenced this pull request Aug 15, 2023
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.

2 participants