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(query): filtered collections pagination (backport #16905) #16991

Merged
merged 5 commits into from
Jul 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 13, 2023

This is an automatic backport of pull request #16905 done by Mergify.
Cherry-pick of 9e098ca has failed:

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

You are currently cherry-picking commit 9e098ca9e.
  (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:   types/query/collections_pagination.go
	modified:   types/query/collections_pagination_test.go
	modified:   x/auth/keeper/grpc_query.go
	modified:   x/bank/keeper/grpc_query.go
	modified:   x/bank/keeper/keeper.go
	modified:   x/circuit/keeper/query.go
	modified:   x/evidence/keeper/grpc_query.go
	modified:   x/gov/keeper/grpc_query.go
	modified:   x/gov/keeper/grpc_query_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/circuit/go.mod
	both modified:   x/circuit/go.sum
	both modified:   x/evidence/go.mod
	both modified:   x/evidence/go.sum

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: atheesh <atheesh@vitwit.com>
Co-authored-by: unknown unknown <unknown@unknown>
(cherry picked from commit 9e098ca)

# Conflicts:
#	CHANGELOG.md
#	x/circuit/go.mod
#	x/circuit/go.sum
#	x/evidence/go.mod
#	x/evidence/go.sum
@mergify mergify bot requested a review from a team as a code owner July 13, 2023 15:47
@mergify mergify bot added the conflicts label Jul 13, 2023
@github-prbot github-prbot requested review from a team, facundomedica and testinginprod and removed request for a team July 13, 2023 15:48
@julienrbrt
Copy link
Member

julienrbrt commented Jul 13, 2023

When fixing the conflicts here, please ensure you take a pseudo version from the release/v0.50.x branch and not main.
Then we should bump the modules on simapp.

@julienrbrt julienrbrt self-assigned this Jul 13, 2023
@julienrbrt
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jul 13, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging CHANGELOG.md
Auto-merging x/circuit/go.mod
CONFLICT (content): Merge conflict in x/circuit/go.mod
Auto-merging x/circuit/go.sum
CONFLICT (content): Merge conflict in x/circuit/go.sum
Auto-merging x/evidence/go.mod
CONFLICT (content): Merge conflict in x/evidence/go.mod
Auto-merging x/evidence/go.sum
CONFLICT (content): Merge conflict in x/evidence/go.sum
error: could not apply 51612e289... fix(query): filtered collections pagination (#16905)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 51612e289... fix(query): filtered collections pagination (#16905)

err-code: DA1E0

@julienrbrt julienrbrt removed their assignment Jul 13, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) July 13, 2023 22:24
@julienrbrt julienrbrt merged commit d2b61d0 into release/v0.50.x Jul 13, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16905 branch July 13, 2023 22:27
@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