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(server): properly parse multiple gas config (backport #18537) #18544

Merged
merged 2 commits into from
Nov 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 22, 2023

This is an automatic backport of pull request #18537 done by Mergify.
Cherry-pick of 875a71c has failed:

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

You are currently cherry-picking commit 875a71cc6.
  (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:   CHANGELOG.md
	modified:   server/README.md
	modified:   server/config/config.go
	modified:   server/config/config_test.go
	modified:   server/config/toml.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   simapp/simd/cmd/commands.go
	deleted by us:   tools/confix/data/v0.47-app.toml
	deleted by us:   tools/confix/data/v0.50-app.toml

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 875a71c)

# Conflicts:
#	simapp/simd/cmd/commands.go
#	tools/confix/data/v0.47-app.toml
#	tools/confix/data/v0.50-app.toml
@mergify mergify bot requested a review from a team as a code owner November 22, 2023 15:16
@mergify mergify bot added the conflicts label Nov 22, 2023
Copy link
Contributor

coderabbitai bot commented Nov 22, 2023

Important

Auto Review Skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.


Tips

Chat with CodeRabbit Bot (@coderabbitai)

  • If you reply to a review comment from CodeRabbit, the bot will automatically respond.
  • To engage with CodeRabbit bot directly around the specific lines of code in the PR, mention @coderabbitai in your review comment
  • Note: Review comments are made on code diffs or files, not on the PR overview.
  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Note: For conversation with the bot, please use the review comments on code diffs or files.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

@julienrbrt julienrbrt self-assigned this Nov 22, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) November 22, 2023 17:25
@julienrbrt julienrbrt merged commit 55c6d55 into release/v0.47.x Nov 22, 2023
23 of 24 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-18537 branch November 22, 2023 17:40
rkollar pushed a commit to sagaxyz/cosmos-sdk that referenced this pull request Feb 26, 2024
@faddat faddat mentioned this pull request Mar 20, 2024
12 tasks
emidev98 pushed a commit to terra-money/cosmos-sdk that referenced this pull request Mar 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 🥳 Done
Development

Successfully merging this pull request may close these issues.

1 participant