-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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: correct path required proto testdata (backport #14991) #16083
Merged
tac0turtle
merged 5 commits into
release/v0.47.x
from
mergify/bp/release/v0.47.x/pr-14991
May 10, 2023
Merged
fix: correct path required proto testdata (backport #14991) #16083
tac0turtle
merged 5 commits into
release/v0.47.x
from
mergify/bp/release/v0.47.x/pr-14991
May 10, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit a90569c) # Conflicts: # .golangci.yml # CHANGELOG.md # simapp/app.go # simapp/app_v2.go # testutil/assert_helpers.go # testutil/testdata/testpb/pulsar_query.go # testutil/testdata/testpb/query_grpc.pb.go # testutil/testdata/testpb/tx_grpc.pb.go # x/auth/ante/testutil_test.go
19 tasks
fixing the conflict here. ref #16030 |
julienrbrt
approved these changes
May 10, 2023
julienrbrt
requested review from
a team,
mark-rushakoff and
facundomedica
and removed request for
a team
May 10, 2023 15:01
This was referenced May 14, 2023
roy-dydx
pushed a commit
to dydxprotocol/cosmos-sdk
that referenced
this pull request
Jul 11, 2023
…smos#16083) 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#16083) 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #14991 done by Mergify.
Cherry-pick of a90569c has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com