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(auth): return accId in error (backport #17903) #17906

Merged
merged 2 commits into from
Sep 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 27, 2023

This is an automatic backport of pull request #17903 done by Mergify.
Cherry-pick of 6ac0abd has failed:

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

You are currently cherry-picking commit 6ac0abde3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/auth/keeper/grpc_query.go

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 6ac0abd)

# Conflicts:
#	x/auth/keeper/grpc_query.go
@mergify mergify bot requested a review from a team as a code owner September 27, 2023 13:02
@mergify mergify bot added the conflicts label Sep 27, 2023
@julienrbrt julienrbrt merged commit 85034c1 into release/v0.47.x Sep 27, 2023
27 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-17903 branch September 27, 2023 13:44
mmsqe pushed a commit to mmsqe/cosmos-sdk that referenced this pull request Oct 9, 2023
@faddat faddat mentioned this pull request Mar 20, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants