diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index 85ead1fabb92125a73e540dc079fe641dcc77df3..35aeb52fd18a3ada0bf28e107c2390358decd3d9 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -11261,7 +11261,7 @@ type Group { ): [VulnerableProjectsByGrade!]! """ - Vulnerability scanners reported on the project vulnerabilties of the group and its subgroups + Vulnerability scanners reported on the project vulnerabilities of the group and its subgroups """ vulnerabilityScanners( """ @@ -11966,7 +11966,7 @@ type InstanceSecurityDashboard { vulnerabilityGrades: [VulnerableProjectsByGrade!]! """ - Vulnerability scanners reported on the vulnerabilties from projects selected in Instance Security Dashboard + Vulnerability scanners reported on the vulnerabilities from projects selected in Instance Security Dashboard """ vulnerabilityScanners( """ @@ -19650,7 +19650,7 @@ type Project { ): VulnerabilitiesCountByDayConnection """ - Vulnerability scanners reported on the project vulnerabilties + Vulnerability scanners reported on the project vulnerabilities """ vulnerabilityScanners( """ diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index a38e743f862a24fe4d3a46fb6d6e9f102faa146b..0f6e0743ccb2752f6f789ad605fc79e94ad9b4d1 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -30680,7 +30680,7 @@ }, { "name": "vulnerabilityScanners", - "description": "Vulnerability scanners reported on the project vulnerabilties of the group and its subgroups", + "description": "Vulnerability scanners reported on the project vulnerabilities of the group and its subgroups", "args": [ { "name": "after", @@ -32690,7 +32690,7 @@ }, { "name": "vulnerabilityScanners", - "description": "Vulnerability scanners reported on the vulnerabilties from projects selected in Instance Security Dashboard", + "description": "Vulnerability scanners reported on the vulnerabilities from projects selected in Instance Security Dashboard", "args": [ { "name": "after", @@ -57062,7 +57062,7 @@ }, { "name": "vulnerabilityScanners", - "description": "Vulnerability scanners reported on the project vulnerabilties", + "description": "Vulnerability scanners reported on the project vulnerabilities", "args": [ { "name": "after", diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 5eb76275e349de6298b28c0a6cfd515542faa415..f50cacf0cb90843159a21771e7506cdd8c566084 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -1693,7 +1693,7 @@ Autogenerated return type of GitlabSubscriptionActivate. | `vulnerabilitiesCountByDay` | VulnerabilitiesCountByDayConnection | Number of vulnerabilities per day for the projects in the group and its subgroups | | `vulnerabilitiesCountByDayAndSeverity` **{warning-solid}** | VulnerabilitiesCountByDayAndSeverityConnection | **Deprecated:** Use `vulnerabilitiesCountByDay`. Deprecated in 13.3. | | `vulnerabilityGrades` | VulnerableProjectsByGrade! => Array | Represents vulnerable project counts for each grade | -| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the project vulnerabilties of the group and its subgroups | +| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the project vulnerabilities of the group and its subgroups | | `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity in the group and its subgroups | | `webUrl` | String! | Web URL of the group. | @@ -1818,7 +1818,7 @@ A block of time for which a participant is on-call.. | ----- | ---- | ----------- | | `projects` | ProjectConnection! | Projects selected in Instance Security Dashboard | | `vulnerabilityGrades` | VulnerableProjectsByGrade! => Array | Represents vulnerable project counts for each grade | -| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the vulnerabilties from projects selected in Instance Security Dashboard | +| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the vulnerabilities from projects selected in Instance Security Dashboard | | `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity from projects selected in Instance Security Dashboard | ### InstanceStatisticsMeasurement @@ -2824,7 +2824,7 @@ Autogenerated return type of PipelineRetry. | `visibility` | String | Visibility of the project | | `vulnerabilities` | VulnerabilityConnection | Vulnerabilities reported on the project | | `vulnerabilitiesCountByDay` | VulnerabilitiesCountByDayConnection | Number of vulnerabilities per day for the project | -| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the project vulnerabilties | +| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the project vulnerabilities | | `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity in the project | | `webUrl` | String | Web URL of the project | | `wikiEnabled` | Boolean | Indicates if Wikis are enabled for the current user | diff --git a/ee/app/graphql/ee/types/group_type.rb b/ee/app/graphql/ee/types/group_type.rb index e0a79b678d6389dd67243f6186574c6e43c18874..6d2e4942111e2e382e7c74f75b14fc054defefa4 100644 --- a/ee/app/graphql/ee/types/group_type.rb +++ b/ee/app/graphql/ee/types/group_type.rb @@ -54,7 +54,7 @@ module GroupType field :vulnerability_scanners, ::Types::VulnerabilityScannerType.connection_type, null: true, - description: 'Vulnerability scanners reported on the project vulnerabilties of the group and its subgroups', + description: 'Vulnerability scanners reported on the project vulnerabilities of the group and its subgroups', resolver: ::Resolvers::Vulnerabilities::ScannersResolver field :vulnerability_severities_count, ::Types::VulnerabilitySeveritiesCountType, null: true, diff --git a/ee/app/graphql/ee/types/project_type.rb b/ee/app/graphql/ee/types/project_type.rb index 6ef764d434927256862f14f7f1e2371219c37523..9b07f222f94e8aec099e9aad496ea2d3e25e3a2c 100644 --- a/ee/app/graphql/ee/types/project_type.rb +++ b/ee/app/graphql/ee/types/project_type.rb @@ -24,7 +24,7 @@ module ProjectType field :vulnerability_scanners, ::Types::VulnerabilityScannerType.connection_type, null: true, - description: 'Vulnerability scanners reported on the project vulnerabilties', + description: 'Vulnerability scanners reported on the project vulnerabilities', resolver: ::Resolvers::Vulnerabilities::ScannersResolver field :vulnerabilities_count_by_day, diff --git a/ee/app/graphql/types/instance_security_dashboard_type.rb b/ee/app/graphql/types/instance_security_dashboard_type.rb index 35520d3c716f1cd63576e7696ab46ffdc9f570a2..618c2df27d1f5911506edd2301d1521f1621f200 100644 --- a/ee/app/graphql/types/instance_security_dashboard_type.rb +++ b/ee/app/graphql/types/instance_security_dashboard_type.rb @@ -14,7 +14,7 @@ class InstanceSecurityDashboardType < BaseObject field :vulnerability_scanners, ::Types::VulnerabilityScannerType.connection_type, null: true, - description: 'Vulnerability scanners reported on the vulnerabilties from projects selected in Instance Security Dashboard', + description: 'Vulnerability scanners reported on the vulnerabilities from projects selected in Instance Security Dashboard', resolver: ::Resolvers::Vulnerabilities::ScannersResolver field :vulnerability_severities_count, ::Types::VulnerabilitySeveritiesCountType, null: true, diff --git a/ee/spec/frontend/security_dashboard/components/security_dashboard_table_spec.js b/ee/spec/frontend/security_dashboard/components/security_dashboard_table_spec.js index cb14821f584b4f1205a6e60ba8409e3047738ed8..adf91a69aa071800ccc4830138f9f4e4065fcc58 100644 --- a/ee/spec/frontend/security_dashboard/components/security_dashboard_table_spec.js +++ b/ee/spec/frontend/security_dashboard/components/security_dashboard_table_spec.js @@ -85,7 +85,7 @@ describe('Security Dashboard Table', () => { }); }); - describe('with no vulnerabilties', () => { + describe('with no vulnerabilities', () => { beforeEach(() => { store.commit(`vulnerabilities/${RECEIVE_VULNERABILITIES_SUCCESS}`, { vulnerabilities: [], diff --git a/ee/spec/services/security/store_report_service_spec.rb b/ee/spec/services/security/store_report_service_spec.rb index 5b7692b0f9a13d4e55a4b476f6cc6422fef716fa..8922f478ab7919beccb9abb8aa9af3ba72f6f17c 100644 --- a/ee/spec/services/security/store_report_service_spec.rb +++ b/ee/spec/services/security/store_report_service_spec.rb @@ -62,7 +62,7 @@ expect { subject }.to change { project.vulnerability_remediations.count }.by(remediations) end - it 'inserts all vulnerabilties' do + it 'inserts all vulnerabilities' do expect { subject }.to change { Vulnerability.count }.by(findings) end end