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(rules): rename Automatic to Automated (backport #693) #694

Merged
merged 2 commits into from
Nov 29, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 29, 2022

This is an automatic backport of pull request #693 done by Mergify.
Cherry-pick of 54c6853 has failed:

On branch mergify/bp/cryostat-v2.2/pr-693
Your branch is up to date with 'origin/cryostat-v2.2'.

You are currently cherry-picking commit 54c6853.
  (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:   src/test/Rules/Rules.test.tsx

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/app/Rules/CreateRule.tsx
	both modified:   src/app/Rules/RulesUploadModal.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

* fix(rules): rename Automatic to Automated

* fixup! fix(rules): rename Automatic to Automated

(cherry picked from commit 54c6853)

# Conflicts:
#	src/app/Rules/CreateRule.tsx
#	src/app/Rules/RulesUploadModal.tsx
@github-actions
Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

1 similar comment
@github-actions
Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@github-actions
Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@andrewazores andrewazores merged commit 69da119 into cryostat-v2.2 Nov 29, 2022
@andrewazores andrewazores deleted the mergify/bp/cryostat-v2.2/pr-693 branch November 29, 2022 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant