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 "Pre-select greenbone sensor as default scanner type" (backport #2924) #2926

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 18, 2021

This is an automatic backport of pull request #2924 done by Mergify.
Cherry-pick of 936e7fb has failed:

On branch mergify/bp/master/pr-2924
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 936e7fb213.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gsa/src/web/pages/scanners/component.js

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

swaterkamp and others added 3 commits May 18, 2021 11:41
(cherry picked from commit 936e7fb)

# Conflicts:
#	gsa/src/web/pages/scanners/component.js
(cherry picked from commit 871dc7f)
(cherry picked from commit a2ec2d4)
@mergify mergify bot requested a review from a team as a code owner May 18, 2021 11:41
@mergify mergify bot added the conflicts label May 18, 2021
@swaterkamp
Copy link
Member

Due to big code differences between branches, this PR is superceded by #2928

@swaterkamp swaterkamp closed this May 18, 2021
@mergify mergify bot deleted the mergify/bp/master/pr-2924 branch May 18, 2021 13:17
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.

None yet

1 participant