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

feat(templates): upgrade interchain-security to v5 (backport #4110) #4120

Merged
merged 3 commits into from
May 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2024

Needs ignite/apps#89 first.


This is an automatic backport of pull request #4110 done by Mergify.

(cherry picked from commit 6bd9fbd)

# Conflicts:
#	ignite/templates/app/files-consumer/app/app.go.plush
#	ignite/templates/app/files-consumer/app/app_config.go.plush
@mergify mergify bot added the conflicts label May 7, 2024
Copy link
Contributor Author

mergify bot commented May 7, 2024

Cherry-pick of 6bd9fbd has failed:

On branch mergify/bp/release/v28.x.y/pr-4110
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit 6bd9fbdf.
  (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:   ignite/internal/plugin/consumer.go
	modified:   ignite/templates/app/files-consumer/app/ante_handler.go.plush
	modified:   ignite/templates/app/files-consumer/app/ibc.go.plush
	modified:   ignite/templates/app/files/go.mod.plush

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ignite/templates/app/files-consumer/app/app.go.plush
	both modified:   ignite/templates/app/files-consumer/app/app_config.go.plush

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

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.

Conflicts

@julienrbrt julienrbrt self-assigned this May 7, 2024
@julienrbrt julienrbrt added skip-changelog Don't check changelog for new entries and removed skip-changelog Don't check changelog for new entries labels May 7, 2024
@julienrbrt julienrbrt enabled auto-merge (squash) May 7, 2024 22:00
@julienrbrt julienrbrt merged commit 7f1b564 into release/v28.x.y May 7, 2024
46 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v28.x.y/pr-4110 branch May 7, 2024 22:01
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.

2 participants