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

Merge 21.10 into master #2901

Merged
merged 80 commits into from
May 6, 2021
Merged

Conversation

sarahd93
Copy link
Contributor

@sarahd93 sarahd93 commented May 6, 2021

What:
Merge 21.10 into master. Note that I have only merged the dependency updates and some minor changes. I have not merged:

Why:

How:

Checklist:

  • Tests
  • CHANGELOG Entry
  • Labels for ports to other branches

dependabot bot and others added 30 commits April 12, 2021 04:11
Bumps [i18next](https://github.com/i18next/i18next) from 20.1.0 to 20.2.1.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next@v20.1.0...v20.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
…arn/gsa/gsa-21.04/i18next-20.2.1

Bump i18next from 20.1.0 to 20.2.1 in /gsa
…arn/gsa/gsa-21.04/babel/core-7.13.15

Bump @babel/core from 7.13.14 to 7.13.15 in /gsa
…arn/gsa/gsa-21.04/storybook/react-6.2.7

Bump @storybook/react from 6.2.3 to 6.2.7 in /gsa
The request parameters host, hostport, hostpath, hosts and hosts_opt and
their aliases can now all contain underscores and hyphens.

(cherry picked from commit 3b20546)
…/pr-2846

Allow underscores and hyphens in host parameters (bp greenbone#2846)
…rity

Revert the changes from severity to score.
…arn/gsa/gsa-21.04/eslint-config-prettier-8.2.0

Bump eslint-config-prettier from 8.1.0 to 8.2.0 in /gsa
Bumps [d3-scale](https://github.com/d3/d3-scale) from 3.2.4 to 3.3.0.
- [Release notes](https://github.com/d3/d3-scale/releases)
- [Commits](d3/d3-scale@v3.2.4...v3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
…arn/gsa/gsa-21.04/d3-scale-3.3.0

Bump d3-scale from 3.2.4 to 3.3.0 in /gsa
…arn/gsa/gsa-21.04/storybook/react-6.2.8

Bump @storybook/react from 6.2.7 to 6.2.8 in /gsa
For creating a scanner use the greenbone sensor as default scanner type
when opening the dialog.
…enbone-sensor

Pre-select greenbone sensor as default scanner type
dependabot bot and others added 26 commits April 27, 2021 08:53
…arn/gsa/gsa-21.04/eslint-config-prettier-8.3.0

Bump eslint-config-prettier from 8.2.0 to 8.3.0 in /gsa
…arn/gsa/gsa-21.04/storybook/react-6.2.9

Bump @storybook/react from 6.2.8 to 6.2.9 in /gsa
Fix dynamic severity checkbox not being checked upon clicking
Don't show word cloud as default in result dashboard
…arn/gsa/gsa-21.04/jest-environment-jsdom-sixteen-2.0.0

Bump jest-environment-jsdom-sixteen from 1.0.3 to 2.0.0 in /gsa
Bumps [i18next](https://github.com/i18next/i18next) from 20.2.1 to 20.2.2.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next@v20.2.1...v20.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
…arn/gsa/gsa-21.04/i18next-20.2.2

Bump i18next from 20.2.1 to 20.2.2 in /gsa
…arn/gsa/gsa-21.04/types/jest-26.0.23

Bump @types/jest from 26.0.22 to 26.0.23 in /gsa
…arn/gsa/gsa-21.04/babel/core-7.14.0

Bump @babel/core from 7.13.16 to 7.14.0 in /gsa
@sarahd93 sarahd93 requested a review from a team as a code owner May 6, 2021 10:41
@bjoernricks bjoernricks enabled auto-merge May 6, 2021 10:54
@bjoernricks bjoernricks merged commit 81f2761 into greenbone:master May 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants