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

fix: check x/bank send enabled before escrowing fees (backport #2942) #2953

Merged
merged 2 commits into from
Dec 19, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 17, 2022

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

On branch mergify/bp/release/v5.2.x/pr-2942
Your branch is up to date with 'origin/release/v5.2.x'.

You are currently cherry-picking commit c676bc6.
  (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:   modules/apps/29-fee/keeper/msg_server.go
	modified:   modules/apps/29-fee/keeper/msg_server_test.go
	modified:   modules/apps/29-fee/types/expected_keepers.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 c676bc6)

# Conflicts:
#	CHANGELOG.md
@crodriguezvega crodriguezvega merged commit fb9c600 into release/v5.2.x Dec 19, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v5.2.x/pr-2942 branch December 19, 2022 12:20
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