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: Add feature flag for multi block failure messages. (backport #10061) #10062

Merged
merged 2 commits into from
Nov 23, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2023

This is an automatic backport of pull request #10061 done by Mergify.
Cherry-pick of 374f724 has failed:

On branch mergify/bp/release-1.28.x/pr-10061
Your branch is up to date with 'origin/release-1.28.x'.

You are currently cherry-picking commit 374f724de2.
  (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:   packages/core/src/config/settings.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packages/app/src/settings.js
	both modified:   packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx

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

@spinnakerbot
Copy link
Contributor

Features cannot be merged into release branches. The following commits are not tagged as one of "fix, chore, docs, perf, test":

Read more about commit conventions and patch releases here.

@ovidiupopa07
Copy link
Contributor

Should be merged after #10063

(cherry picked from commit 374f724)

# Conflicts:
#	packages/app/src/settings.js
#	packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx
@ovidiupopa07 ovidiupopa07 force-pushed the mergify/bp/release-1.28.x/pr-10061 branch from 6cd28bf to 1d642d7 Compare November 22, 2023 18:20
@ovidiupopa07 ovidiupopa07 added ready to merge Reviewed and ready for merge and removed conflicts labels Nov 23, 2023
@mergify mergify bot added the auto merged Merged automatically by a bot label Nov 23, 2023
@mergify mergify bot merged commit 0d188f1 into release-1.28.x Nov 23, 2023
4 checks passed
@mergify mergify bot deleted the mergify/bp/release-1.28.x/pr-10061 branch November 23, 2023 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto merged Merged automatically by a bot ready to merge Reviewed and ready for merge target-release/1.28
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants