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

refactor: provide a helper for baseapp options (backport #14175) #14177

Merged
merged 2 commits into from
Dec 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2022

This is an automatic backport of pull request #14175 done by Mergify.
Cherry-pick of 1b6192f has failed:

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

You are currently cherry-picking commit 1b6192fec.
  (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:   server/mock/app_test.go
	modified:   server/util.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   simapp/simd/cmd/root.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

* provide a helper for baseapp options

* rename

* changelog entry

* fix spelling

(cherry picked from commit 1b6192f)

# Conflicts:
#	CHANGELOG.md
#	simapp/simd/cmd/root.go
@mergify mergify bot requested a review from a team as a code owner December 6, 2022 14:29
@mergify mergify bot added the conflicts label Dec 6, 2022
@tac0turtle tac0turtle enabled auto-merge (squash) December 6, 2022 15:03
@sonarcloud
Copy link

sonarcloud bot commented Dec 6, 2022

[Cosmos SDK - SimApp] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@tac0turtle tac0turtle merged commit 0ac30e7 into release/v0.47.x Dec 6, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-14175 branch December 6, 2022 15:22
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.

1 participant