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

Pre-select greenbone sensor as default scanner type (backport #2867) #2925

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 #2867 done by Mergify.
Cherry-pick of 569560a has failed:

On branch mergify/bp/gsa-21.10/pr-2867
Your branch is up to date with 'origin/gsa-21.10'.

You are currently cherry-picking commit 569560a9a8.
  (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/dialog.js

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

Cherry-pick of ac5fb4c has failed:

On branch mergify/bp/gsa-21.10/pr-2867
Your branch is ahead of 'origin/gsa-21.10' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ac5fb4c53d.
  (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:   CHANGELOG.md

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

Cherry-pick of 42310dc has failed:

On branch mergify/bp/gsa-21.10/pr-2867
Your branch is ahead of 'origin/gsa-21.10' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 42310dc550.
  (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/dialog.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/

For creating a scanner use the greenbone sensor as default scanner type
when opening the dialog.

(cherry picked from commit 569560a)

# Conflicts:
#	gsa/src/web/pages/scanners/dialog.js
(cherry picked from commit ac5fb4c)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit 42310dc)

# Conflicts:
#	gsa/src/web/pages/scanners/dialog.js
@mergify mergify bot requested a review from a team as a code owner May 18, 2021 11:12
@mergify mergify bot added the conflicts label May 18, 2021
@swaterkamp swaterkamp closed this May 18, 2021
@swaterkamp
Copy link
Member

Changes are already in 21.10

@mergify mergify bot deleted the mergify/bp/gsa-21.10/pr-2867 branch May 18, 2021 13:00
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

2 participants