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

Use deprecation tag in NVT details (backport #2960) #2977

Merged
merged 8 commits into from
Jun 8, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 7, 2021

This is an automatic backport of pull request #2960 done by Mergify.
Cherry-pick of 8728dcb has failed:

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

You are currently cherry-picking commit 8728dcb76.
  (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/gmp/models/nvt.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/

(cherry picked from commit 8728dcb)

# Conflicts:
#	gsa/src/gmp/models/nvt.js
(cherry picked from commit e42cc6a)
(cherry picked from commit 847879e)
(cherry picked from commit 5e9a217)
(cherry picked from commit a37397a)
(cherry picked from commit 1a57047)
@mergify mergify bot requested a review from a team as a code owner June 7, 2021 14:08
@mergify mergify bot added the conflicts label Jun 7, 2021
@swaterkamp swaterkamp enabled auto-merge June 8, 2021 08:55
@swaterkamp swaterkamp merged commit e4ab2ce into master Jun 8, 2021
@swaterkamp swaterkamp deleted the mergify/bp/master/pr-2960 branch June 8, 2021 09:07
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.

1 participant