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

Added the deprecated_by field to CPEs (bp #2751) #2753

Merged
merged 8 commits into from
Feb 24, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 24, 2021

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

Cherry-pick of f94aea6 has failed:

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

You are currently cherry-picking commit f94aea6c88.
  (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/cpe.js

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

Cherry-pick of 759774d has failed:

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

You are currently cherry-picking commit 759774d8f3.
  (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:   CHANGELOG.md
	modified:   gsa/src/gmp/models/__tests__/cpe.js
	modified:   gsa/src/gmp/models/cpe.js

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

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/

(cherry picked from commit f94aea6)

# Conflicts:
#	gsa/src/web/pages/cpes/details.js
(cherry picked from commit 71e33d2)
(cherry picked from commit 79f1b9c)
(cherry picked from commit 759774d)

# Conflicts:
#	gsa/src/web/pages/cpes/details.js
@mergify mergify bot requested a review from a team February 24, 2021 07:53
@mergify mergify bot added the conflicts label Feb 24, 2021
@codecov
Copy link

codecov bot commented Feb 24, 2021

Codecov Report

Merging #2753 (8fd22a9) into master (40fd63c) will increase coverage by 0.00%.
The diff coverage is 85.71%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2753   +/-   ##
=======================================
  Coverage   63.32%   63.33%           
=======================================
  Files        1118     1118           
  Lines       28752    28758    +6     
  Branches     8133     8137    +4     
=======================================
+ Hits        18208    18214    +6     
  Misses       9551     9551           
  Partials      993      993           
Impacted Files Coverage Δ
gsa/src/web/graphql/cpes.js 100.00% <ø> (ø)
gsa/src/gmp/models/cpe.js 96.66% <83.33%> (-3.34%) ⬇️
gsa/src/web/pages/cpes/details.js 94.44% <100.00%> (+5.55%) ⬆️

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 40fd63c...8f931a3. Read the comment docs.

@y0urself y0urself merged commit 18ff765 into master Feb 24, 2021
@y0urself y0urself deleted the mergify/bp/master/pr-2751 branch February 24, 2021 11:37
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