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

docs: improve proto vesting docs about time attributes (backport #15474) #15480

Merged
merged 2 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 #15474 done by Mergify.
Cherry-pick of 5612bb8 has failed:

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

You are currently cherry-picking commit 5612bb815.
  (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/vesting/v1beta1/vesting.pulsar.go
	modified:   x/auth/vesting/types/vesting.pb.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   api/cosmos/vesting/v1beta1/tx.pulsar.go
	deleted by us:   client/v2/internal/testpb/msg.proto
	both modified:   orm/internal/testpb/bank.proto
	both modified:   proto/cosmos/vesting/v1beta1/tx.proto
	both modified:   proto/cosmos/vesting/v1beta1/vesting.proto
	deleted by us:   tests/integration/aminojson/internal/testpb/test.proto
	both modified:   x/auth/vesting/types/tx.pb.go
	deleted by us:   x/tx/internal/testpb/signers.proto

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

@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 230 existing alerts. Please check the repository Security tab to see all alerts.

@julienrbrt
Copy link
Member

julienrbrt commented Mar 20, 2023

Note to self, we should avoid linting in a PR that will be backported.

@tac0turtle
Copy link
Member

Note to self, we should avoid linting in a PR that will be backported.

everything that is cosmetic shouldnt be backported 😉

@julienrbrt
Copy link
Member

Ran make proto-gen and it did the same thing as here: #15268.
I think we should commit it to avoid noise in future PRs as we did for #15268.

@julienrbrt julienrbrt enabled auto-merge (squash) March 20, 2023 17:40
@julienrbrt julienrbrt merged commit 979adcf into release/v0.47.x Mar 20, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-15474 branch March 20, 2023 17:55
@robert-zaremba
Copy link
Collaborator

Note to self, we should avoid linting in a PR that will be backported.

Agree, sorry, it came automatically for some reason.

@robert-zaremba
Copy link
Collaborator

Thanks for backporting the PR @julienrbrt !

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.

3 participants