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: simplify ADR-028 and address.Module (backport #14017) #14632

Merged
merged 2 commits into from
Jan 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2023

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

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

You are currently cherry-picking commit fd3bac0bd.
  (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/architecture/adr-028-public-key-addresses.md
	modified:   types/address/hash.go
	modified:   types/address/hash_test.go
	modified:   x/auth/types/account.go
	modified:   x/auth/types/credentials.go
	modified:   x/auth/types/credentials_test.go
	modified:   x/group/keeper/keeper_test.go
	modified:   x/group/keeper/msg_server.go
	modified:   x/group/migrations/v2/gen_state.go
	modified:   x/group/migrations/v2/gen_state_test.go
	modified:   x/group/migrations/v2/migrate.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

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
Co-authored-by: Aaron Craelius <aaron@regen.network>
Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit fd3bac0)

# Conflicts:
#	CHANGELOG.md
@alexanderbez alexanderbez merged commit 8df686e into release/v0.47.x Jan 16, 2023
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.47.x/pr-14017 branch January 16, 2023 15:08
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.

3 participants