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: add query groups in x/group (backport #14879) #15475

Merged
merged 4 commits into from
Mar 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2023

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

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

You are currently cherry-picking commit a2797c8cd.
  (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/query.pulsar.go
	modified:   api/cosmos/group/v1/query_grpc.pb.go
	modified:   api/cosmos/orm/module/v1alpha1/module.pulsar.go
	modified:   proto/cosmos/group/v1/query.proto
	modified:   tests/e2e/group/query.go
	modified:   x/group/client/cli/query.go
	modified:   x/group/keeper/grpc_query.go
	modified:   x/group/query.pb.go
	modified:   x/group/query.pb.gw.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/group/keeper/grpc_query_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: Likhita Polavarapu <78951027+likhita-809@users.noreply.github.com>
(cherry picked from commit a2797c8)

# Conflicts:
#	CHANGELOG.md
#	x/group/keeper/grpc_query_test.go
@mergify mergify bot requested a review from a team as a code owner March 20, 2023 16:04
@mergify mergify bot added the conflicts label Mar 20, 2023
@mergify mergify bot mentioned this pull request Mar 20, 2023
19 tasks
@github-advanced-security
Copy link

You have successfully added a new gosec configuration .github/workflows/gosec.yml:Gosec. As part of the setup process, we have scanned this repository and found 225 existing alerts. Please check the repository Security tab to see all alerts.

@julienrbrt julienrbrt self-assigned this Mar 20, 2023
@julienrbrt
Copy link
Member

Let's wait for #15480 to be merged, so we can see clearer the changes here (due to the make proto-gen blob #15480 (comment), it makes it hard to check otherwise)

@julienrbrt julienrbrt removed their assignment Mar 20, 2023
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK

@julienrbrt julienrbrt enabled auto-merge (squash) March 20, 2023 18:03
@julienrbrt julienrbrt merged commit a0497b7 into release/v0.47.x Mar 20, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14879 branch March 20, 2023 18:19
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