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(group): add group event tally result (backport #16191) #16305

Merged
merged 3 commits into from
May 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 26, 2023

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

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

You are currently cherry-picking commit be2003e58.
  (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:   api/cosmos/group/v1/events.pulsar.go
	modified:   proto/cosmos/group/v1/events.proto
	modified:   proto/cosmos/group/v1/query.proto
	modified:   x/group/README.md
	modified:   x/group/events.pb.go
	modified:   x/group/keeper/genesis.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   api/cosmos/group/v1/types.pulsar.go
	both modified:   proto/cosmos/group/v1/types.proto
	both modified:   x/group/keeper/keeper.go
	both modified:   x/group/keeper/msg_server.go
	deleted by us:   x/group/keeper/msg_server_test.go
	both modified:   x/group/types.pb.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: Julien Robert <julien@rbrt.fr>
(cherry picked from commit be2003e)

# Conflicts:
#	CHANGELOG.md
#	api/cosmos/group/v1/types.pulsar.go
#	proto/cosmos/group/v1/types.proto
#	x/group/keeper/keeper.go
#	x/group/keeper/msg_server.go
#	x/group/keeper/msg_server_test.go
#	x/group/types.pb.go
@mergify mergify bot requested a review from a team as a code owner May 26, 2023 09:46
@mergify mergify bot added the conflicts label May 26, 2023
@julienrbrt julienrbrt merged commit d64fccb into release/v0.47.x May 26, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-16191 branch May 26, 2023 11:56
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
…smos#16305)

Co-authored-by: Jeancarlo Barrios <JeancarloBarrios@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
kakysha pushed a commit to InjectiveLabs/cosmos-sdk that referenced this pull request Aug 15, 2023
…smos#16305)

Co-authored-by: Jeancarlo Barrios <JeancarloBarrios@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants