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

Revert the changes from severity to score. (backport #2854) #2856

Merged
merged 7 commits into from
Apr 20, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 14, 2021

This is an automatic backport of pull request #2854 done by Mergify.

Cherry-pick of a99f6e0 has failed:

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

You are currently cherry-picking commit a99f6e0a3e.
  (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:   gsa/src/gmp/models/__tests__/certbund.js
	modified:   gsa/src/gmp/models/__tests__/cpe.js
	modified:   gsa/src/gmp/models/__tests__/cve.js
	modified:   gsa/src/gmp/models/__tests__/dfncert.js
	modified:   gsa/src/gmp/models/__tests__/nvt.js
	modified:   gsa/src/gmp/models/__tests__/ovaldef.js
	modified:   gsa/src/gmp/models/certbund.js
	modified:   gsa/src/gmp/models/cve.js
	modified:   gsa/src/gmp/models/dfncert.js
	modified:   gsa/src/gmp/models/nvt.js
	modified:   gsa/src/gmp/models/ovaldef.js
	modified:   gsa/src/web/pages/cves/__tests__/row.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gsa/src/gmp/models/cpe.js
	both modified:   gsa/src/web/pages/cves/__tests__/detailspage.js

Cherry-pick of 13ab2ee has failed:

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

You are currently cherry-picking commit 13ab2ee111.
  (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")

To fixup this pull request, you can check out it 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/

…again.

(cherry picked from commit a99f6e0)

# Conflicts:
#	gsa/src/gmp/models/cpe.js
#	gsa/src/web/pages/cves/__tests__/detailspage.js
(cherry picked from commit 13ab2ee)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team April 14, 2021 12:51
@mergify mergify bot added the conflicts label Apr 14, 2021
CHANGELOG.md Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Apr 15, 2021

Codecov Report

Merging #2856 (99e33e8) into master (e369199) will decrease coverage by 0.00%.
The diff coverage is 84.61%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2856      +/-   ##
==========================================
- Coverage   64.76%   64.75%   -0.01%     
==========================================
  Files        1120     1120              
  Lines       29124    29121       -3     
  Branches     8239     8240       +1     
==========================================
- Hits        18862    18858       -4     
- Misses       9283     9284       +1     
  Partials      979      979              
Impacted Files Coverage Δ
gsa/src/gmp/models/cve.js 90.56% <60.00%> (-1.75%) ⬇️
gsa/src/gmp/models/certbund.js 100.00% <100.00%> (ø)
gsa/src/gmp/models/cpe.js 89.65% <100.00%> (-0.35%) ⬇️
gsa/src/gmp/models/dfncert.js 100.00% <100.00%> (ø)
gsa/src/gmp/models/nvt.js 99.08% <100.00%> (ø)
gsa/src/gmp/models/ovaldef.js 94.54% <100.00%> (-0.10%) ⬇️
gsa/src/web/pages/cves/details.js 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e369199...99e33e8. Read the comment docs.

y0urself
y0urself previously approved these changes Apr 15, 2021
Keep undefined vector if not vector is available.
@bjoernricks bjoernricks merged commit 2d0fa8b into master Apr 20, 2021
@bjoernricks bjoernricks deleted the mergify/bp/master/pr-2854 branch April 20, 2021 09:01
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.

2 participants