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(gov): re-arrange govv1 NewProposal args and cherry-pick proposer migration (backport #14782) #14785

Merged
merged 6 commits into from
Jan 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2023

This is an automatic backport of pull request #14782 done by Mergify.
Cherry-pick of 2b64d74 has failed:

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

You are currently cherry-picking commit 2b64d74e5.
  (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/gov/keeper/proposal.go
	modified:   x/gov/keeper/proposal_test.go
	modified:   x/gov/migrations/v4/store_test.go
	modified:   x/gov/types/v1/proposal.go
	modified:   x/gov/types/v1/proposals_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/gov/simulation/operations_test.go

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 2b64d74)

# Conflicts:
#	CHANGELOG.md
#	x/gov/simulation/operations_test.go
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

Cherry-picking proposer stuff as mentioned here #14782

@julienrbrt julienrbrt self-assigned this Jan 25, 2023
@julienrbrt julienrbrt changed the title chore(gov): move args in gov new proposal constructor (backport #14782) chore(gov): re-arrange govv1 NewProposal args and cherry-pick proposer migration (backport #14782) Jan 25, 2023
@julienrbrt
Copy link
Member

@alexanderbez alexanderbez enabled auto-merge (squash) January 25, 2023 22:48
@alexanderbez alexanderbez merged commit 591f1be into release/v0.47.x Jan 25, 2023
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.47.x/pr-14782 branch January 25, 2023 22:56
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

2 participants