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

x/lock: Fix ExtendLockup API (backport #1937) #2030

Merged
merged 2 commits into from
Jul 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 12, 2022

This is an automatic backport of pull request #1937 done by Mergify.
Cherry-pick of 99304f2 has failed:

On branch mergify/bp/v10.x/pr-1937
Your branch is up to date with 'origin/v10.x'.

You are currently cherry-picking commit 99304f2b.
  (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/lockup/keeper/lock.go
	modified:   x/lockup/keeper/lock_test.go
	modified:   x/lockup/keeper/msg_server.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 extendlock api

* Apply suggestions from code review

* Add changelog

Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Dev Ojha <[email protected]>
(cherry picked from commit 99304f2)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team July 12, 2022 09:38
@mergify mergify bot added the conflicts label Jul 12, 2022
Copy link
Member

@mattverse mattverse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added CHANGELOG for this backport

@mattverse mattverse merged commit bd32316 into v10.x Jul 12, 2022
@mattverse mattverse deleted the mergify/bp/v10.x/pr-1937 branch July 12, 2022 11:19
ValarDragon added a commit that referenced this pull request Aug 1, 2022
ValarDragon added a commit that referenced this pull request Aug 3, 2022
* Revert "x/lock: Fix `ExtendLockup` API  (backport #1937) (#2030)"

This reverts commit bd32316.

* Revert "Refactor `lock` method (backport #1936) (#2029)"

This reverts commit d733f64.

* Update changelog

* Update changelog
@github-actions github-actions bot mentioned this pull request Feb 15, 2024
@github-actions github-actions bot mentioned this pull request Apr 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant