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(auth): make address codec pluggable (backport #16621) #16736

Merged
merged 2 commits into from
Jun 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 28, 2023

This is an automatic backport of pull request #16621 done by Mergify.
Cherry-pick of 256e37c has failed:

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

You are currently cherry-picking commit 256e37c52.
  (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:   depinject/container_test.go
	modified:   simapp/app.go
	modified:   simapp/app_v2.go
	modified:   tests/integration/bank/keeper/deterministic_test.go
	modified:   tests/integration/distribution/keeper/msg_server_test.go
	modified:   tests/integration/evidence/keeper/infraction_test.go
	modified:   tests/integration/gov/keeper/keeper_test.go
	modified:   tests/integration/slashing/keeper/keeper_test.go
	modified:   tests/integration/staking/keeper/common_test.go
	modified:   tests/integration/staking/keeper/determinstic_test.go
	modified:   x/auth/ante/testutil_test.go
	modified:   x/auth/keeper/deterministic_test.go
	modified:   x/auth/keeper/grpc_query.go
	modified:   x/auth/keeper/keeper.go
	modified:   x/auth/keeper/keeper_test.go
	modified:   x/auth/module.go
	modified:   x/auth/vesting/msg_server_test.go
	modified:   x/auth/vesting/types/vesting_account_test.go
	modified:   x/group/migrations/v2/migrate_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   simapp/app_test.go
	both modified:   testutil/integration/example_test.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

Co-authored-by: Matt Kocubinski <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
(cherry picked from commit 256e37c)

# Conflicts:
#	CHANGELOG.md
#	simapp/app_test.go
#	testutil/integration/example_test.go
@mergify mergify bot requested a review from a team as a code owner June 28, 2023 12:00
@mergify mergify bot added the conflicts label Jun 28, 2023
@github-prbot github-prbot requested review from a team, facundomedica and atheeshp and removed request for a team June 28, 2023 12:01
@julienrbrt julienrbrt enabled auto-merge (squash) June 28, 2023 12:07
@julienrbrt julienrbrt merged commit cd8ba48 into release/v0.50.x Jun 28, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16621 branch June 28, 2023 12:19
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants