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: clawback before vesting start time (backport #483) #494

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 19, 2022

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

On branch mergify/bp/release/v3.0.x/pr-483
Your branch is up to date with 'origin/release/v3.0.x'.

You are currently cherry-picking commit f9a1828.
  (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:   x/vesting/keeper/msg_server.go
	modified:   x/vesting/keeper/msg_server_test.go
	modified:   x/vesting/types/clawback_vesting_account.go
	modified:   x/vesting/types/clawback_vesting_account_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

* fix: clawback before vesting start time

* types test

* changelog

(cherry picked from commit f9a1828)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Apr 19, 2022
@mergify mergify bot mentioned this pull request Apr 19, 2022
12 tasks
@fedekunze fedekunze closed this Apr 19, 2022
@mergify mergify bot deleted the mergify/bp/release/v3.0.x/pr-483 branch April 19, 2022 05:33
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.

None yet

1 participant