diff --git a/app/assets/javascripts/security_configuration/components/app.vue b/app/assets/javascripts/security_configuration/components/app.vue index 3ebd21609a669dc4dc5eae6d070807f4505c5881..e96f71981e5e20f1a5afa238989a7a1765a46244 100644 --- a/app/assets/javascripts/security_configuration/components/app.vue +++ b/app/assets/javascripts/security_configuration/components/app.vue @@ -26,7 +26,7 @@ export const i18n = { scanner will not be reflected as such until the pipeline has been successfully executed and it has generated valid artifacts.`, ), - securityConfiguration: __('Security Configuration'), + securityConfiguration: __('Security configuration'), vulnerabilityManagement: s__('SecurityConfiguration|Vulnerability Management'), securityTraining: s__('SecurityConfiguration|Security training'), securityTrainingDescription: s__( diff --git a/app/views/projects/security/configuration/show.html.haml b/app/views/projects/security/configuration/show.html.haml index 4b82f74d03562658a4a39fc764cfebb568341cbf..2904fb81afe9e4ed31f6f91c5545c61959af0dca 100644 --- a/app/views/projects/security/configuration/show.html.haml +++ b/app/views/projects/security/configuration/show.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title _("Security Configuration") -- page_title _("Security Configuration") +- breadcrumb_title _("Security configuration") +- page_title _("Security configuration") - @content_class = "limit-container-width" unless fluid_layout #js-security-configuration{ data: { **@configuration.to_html_data_attribute, diff --git a/doc/user/application_security/api_fuzzing/index.md b/doc/user/application_security/api_fuzzing/index.md index 5ed78a1995f98ad5bda978174ac6cc939dea0030..d8e976f0cb16342021e194f2a9c3ec37e55e9267 100644 --- a/doc/user/application_security/api_fuzzing/index.md +++ b/doc/user/application_security/api_fuzzing/index.md @@ -98,7 +98,7 @@ a YAML snippet that you can paste in your GitLab CI/CD configuration. To generate an API Fuzzing configuration snippet: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. In the **API Fuzzing** row, select **Enable API Fuzzing**. 1. Complete the fields. For details see [Available CI/CD variables](#available-cicd-variables). 1. Select **Generate code snippet**. diff --git a/doc/user/application_security/configuration/index.md b/doc/user/application_security/configuration/index.md index f0ca51732755c0d2d7a578fabf51bdcc8fa938bb..380624c91ce363e98781c3983af01abd0d715f9f 100644 --- a/doc/user/application_security/configuration/index.md +++ b/doc/user/application_security/configuration/index.md @@ -5,7 +5,7 @@ group: Static Analysis info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Security Configuration **(FREE)** +# Security configuration **(FREE)** > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20711) in GitLab 12.6. > - SAST configuration was [enabled](https://gitlab.com/groups/gitlab-org/-/epics/3659) in 13.3 and [improved](https://gitlab.com/gitlab-org/gitlab/-/issues/232862) in 13.4. @@ -13,7 +13,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > - A simplified version was made [available in all tiers](https://gitlab.com/gitlab-org/gitlab/-/issues/294076) in GitLab 13.10. > - [Redesigned](https://gitlab.com/gitlab-org/gitlab/-/issues/326926) in 14.2. -The Security Configuration page lists the following for the security testing and compliance tools: +The **Security configuration** page lists the following for the security testing and compliance tools: - Name, description, and a documentation link. - Whether or not it is available. @@ -41,7 +41,7 @@ all security features are configured by default. To view a project's security configuration: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. Select **Configuration history** to see the `.gitlab-ci.yml` file's history. diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md index d76f5ebcfbadab0a56fa815df9cc48fabe5cd130..4e2a36e11f586a3b80f9c22f203ef7dab02bcd52 100644 --- a/doc/user/application_security/container_scanning/index.md +++ b/doc/user/application_security/container_scanning/index.md @@ -328,7 +328,7 @@ To enable Container Scanning in a project, create a merge request from the Secur page: 1. In the project where you want to enable Container Scanning, go to - **Security and Compliance > Configuration**. + **Security and Compliance > Security configuration**. 1. In the **Container Scanning** row, select **Configure with a merge request**. This automatically creates a merge request with the changes necessary to enable Container Scanning. diff --git a/doc/user/application_security/coverage_fuzzing/index.md b/doc/user/application_security/coverage_fuzzing/index.md index 820c150597a521c293c53a606ef6fc59e4abdfbc..eb00764f00266866a121002a914bed36bdfdad31 100644 --- a/doc/user/application_security/coverage_fuzzing/index.md +++ b/doc/user/application_security/coverage_fuzzing/index.md @@ -54,7 +54,7 @@ You can use the following fuzzing engines to test the specified languages. To confirm the status of coverage-guided fuzz testing: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. In the **Coverage Fuzzing** section the status is: - **Not configured** - **Enabled** @@ -168,7 +168,7 @@ artifacts files you can download from the CI/CD pipeline. Also, a project member To view details of the corpus registry: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. In the **Coverage Fuzzing** section, select **Manage corpus**. ### Create a corpus in the corpus registry @@ -196,7 +196,7 @@ provided by the `COVFUZZ_CORPUS_NAME` variable. The corpus is updated on every p To upload an existing corpus file: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. In the **Coverage Fuzzing** section, select **Manage corpus**. 1. Select **New corpus**. 1. Complete the fields. diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md index ccca3c90c672ab727b0415a6ecc3b5d689939608..506431220be245dabbb89ebf0ddeb2151352325d 100644 --- a/doc/user/application_security/dependency_scanning/index.md +++ b/doc/user/application_security/dependency_scanning/index.md @@ -553,7 +553,7 @@ always take the latest dependency scanning artifact available. To enable Dependency Scanning in a project, you can create a merge request: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. In the **Dependency Scanning** row, select **Configure with a merge request**. 1. Review and merge the merge request to enable Dependency Scanning. diff --git a/doc/user/application_security/iac_scanning/index.md b/doc/user/application_security/iac_scanning/index.md index 907248b7d65e4142c04338ec98fa13ea037f12a0..8b0a55e5fb7fa8c6e4c469cc2e7996b30e9936ae 100644 --- a/doc/user/application_security/iac_scanning/index.md +++ b/doc/user/application_security/iac_scanning/index.md @@ -119,7 +119,7 @@ that you can download and analyze. To enable IaC Scanning in a project, you can create a merge request: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. In the **Infrastructure as Code (IaC) Scanning** row, select **Configure with a merge request**. 1. Review and merge the merge request to enable IaC Scanning. diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md index 7cb381fe7e51e8ae3f95b2c1a1601935030f44e7..b826b13d75008ef179a74004219e52f54f776f5b 100644 --- a/doc/user/application_security/sast/index.md +++ b/doc/user/application_security/sast/index.md @@ -303,7 +303,7 @@ successfully, and an error may occur. To enable and configure SAST with customizations: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. If the project does not have a `.gitlab-ci.yml` file, select **Enable SAST** in the Static Application Security Testing (SAST) row, otherwise select **Configure SAST**. 1. Enter the custom SAST values. diff --git a/doc/user/application_security/secret_detection/index.md b/doc/user/application_security/secret_detection/index.md index f1a42989769e997658d445ef01357dead59b2e5b..1df25837e4b62c4b37179484d1a6dd680628c13c 100644 --- a/doc/user/application_security/secret_detection/index.md +++ b/doc/user/application_security/secret_detection/index.md @@ -185,7 +185,7 @@ error may occur. In that case, use the [manual](#edit-the-gitlabciyml-file-manua To enable Secret Detection automatically: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. In the **Secret Detection** row, select **Configure with a merge request**. 1. Optional. Complete the fields. 1. Select **Create merge request**. diff --git a/doc/user/application_security/secure_your_application.md b/doc/user/application_security/secure_your_application.md index fb10efff2c60f8fc68abb897409e3df65ffedb38..8dd1168a0d9188fbf1bf87e7c149a8dcc1d8d1c1 100644 --- a/doc/user/application_security/secure_your_application.md +++ b/doc/user/application_security/secure_your_application.md @@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w GitLab can check your applications for security vulnerabilities. - [Get started](get-started-security.md) -- [Security Configuration](configuration/index.md) +- [Security configuration](configuration/index.md) - [Container Scanning](container_scanning/index.md) - [Dependency Scanning](dependency_scanning/index.md) - [Static Application Security Testing](sast/index.md) diff --git a/doc/user/application_security/vulnerabilities/index.md b/doc/user/application_security/vulnerabilities/index.md index ede86f29fc96209644f154df9a67267b4b3de9ea..8107b9d84849f22287dfdcb46ded1d97db73725f 100644 --- a/doc/user/application_security/vulnerabilities/index.md +++ b/doc/user/application_security/vulnerabilities/index.md @@ -204,7 +204,7 @@ Security training helps your developers learn how to fix vulnerabilities. Develo To enable security training for vulnerabilities in your project: 1. On the top bar, select **Main menu > Projects** and find your project. -1. On the left sidebar, select **Security and Compliance > Configuration**. +1. On the left sidebar, select **Security and Compliance > Security configuration**. 1. On the tab bar, select **Vulnerability Management**. 1. To enable a security training provider, turn on the toggle. diff --git a/ee/app/assets/javascripts/security_configuration/api_fuzzing/components/app.vue b/ee/app/assets/javascripts/security_configuration/api_fuzzing/components/app.vue index 6a67be1294ac2fb81f4015873c86fc0f9c6ee5e3..b6b4d5b0fed6f9f1da1c3fc53a44525afca8cb81 100644 --- a/ee/app/assets/javascripts/security_configuration/api_fuzzing/components/app.vue +++ b/ee/app/assets/javascripts/security_configuration/api_fuzzing/components/app.vue @@ -45,7 +45,7 @@ export default { <template> <configuration-page-layout> - <template #heading> {{ s__('APIFuzzing|API Fuzzing Configuration') }} </template> + <template #heading> {{ $options.i18n.title }} </template> <template #description> <gl-sprintf :message="$options.i18n.helpText"> <template #docsLink="{ content }"> diff --git a/ee/app/assets/javascripts/security_configuration/sast/components/app.vue b/ee/app/assets/javascripts/security_configuration/sast/components/app.vue index dda50591cfb51c3f6f81746b4ac1ea910eb64c43..7d6191ff4aa6d304c9991a4c3be139ebc7017140 100644 --- a/ee/app/assets/javascripts/security_configuration/sast/components/app.vue +++ b/ee/app/assets/javascripts/security_configuration/sast/components/app.vue @@ -95,7 +95,7 @@ export default { </dismissible-feedback-alert> </template> - <template #heading> {{ s__('SecurityConfiguration|SAST Configuration') }} </template> + <template #heading> {{ s__('SecurityConfiguration|SAST configuration') }} </template> <template #description> <gl-sprintf :message="$options.i18n.helpText"> <template #link="{ content }"> diff --git a/ee/app/views/projects/security/api_fuzzing_configuration/show.html.haml b/ee/app/views/projects/security/api_fuzzing_configuration/show.html.haml index 4945c88b40dff4248acf66e55746aa745757b295..093a9e018df13aed45a85b18ff4bcc0a02b2283f 100644 --- a/ee/app/views/projects/security/api_fuzzing_configuration/show.html.haml +++ b/ee/app/views/projects/security/api_fuzzing_configuration/show.html.haml @@ -1,6 +1,6 @@ -- add_to_breadcrumbs _("Security Configuration"), project_security_configuration_path(@project) -- breadcrumb_title _("API Fuzzing Configuration") -- page_title _("API Fuzzing Configuration") +- add_to_breadcrumbs _("Security configuration"), project_security_configuration_path(@project) +- breadcrumb_title s_("APIFuzzing|API Fuzzing Configuration") +- page_title s_("APIFuzzing|API Fuzzing Configuration") - content_for :prefetch_asset_tags do - webpack_preload_asset_tag('monaco') diff --git a/ee/app/views/projects/security/configuration/show.html.haml b/ee/app/views/projects/security/configuration/show.html.haml index 4b82f74d03562658a4a39fc764cfebb568341cbf..2904fb81afe9e4ed31f6f91c5545c61959af0dca 100644 --- a/ee/app/views/projects/security/configuration/show.html.haml +++ b/ee/app/views/projects/security/configuration/show.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title _("Security Configuration") -- page_title _("Security Configuration") +- breadcrumb_title _("Security configuration") +- page_title _("Security configuration") - @content_class = "limit-container-width" unless fluid_layout #js-security-configuration{ data: { **@configuration.to_html_data_attribute, diff --git a/ee/app/views/projects/security/corpus_management/show.html.haml b/ee/app/views/projects/security/corpus_management/show.html.haml index 90a2a720c154d5ddad7b0487df3a76bcb2c4fc2b..d2e1e9c5cc3229670a77f4a9e968b97afe835e8c 100644 --- a/ee/app/views/projects/security/corpus_management/show.html.haml +++ b/ee/app/views/projects/security/corpus_management/show.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs _('Security Configuration'), project_security_configuration_path(@project) +- add_to_breadcrumbs _('Security configuration'), project_security_configuration_path(@project) - breadcrumb_title s_('CorpusManagement|Fuzz testing corpus management') - page_title s_('CorpusManagement|Fuzz testing corpus management') diff --git a/ee/app/views/projects/security/dast_configuration/show.html.haml b/ee/app/views/projects/security/dast_configuration/show.html.haml index 58663f2b75e3d9393e5698c5d3d35a77847546c0..d44b7491add188162bf13882dcb15b2e76a18536 100644 --- a/ee/app/views/projects/security/dast_configuration/show.html.haml +++ b/ee/app/views/projects/security/dast_configuration/show.html.haml @@ -1,6 +1,6 @@ -- add_to_breadcrumbs _("Security Configuration"), project_security_configuration_path(@project) -- breadcrumb_title _("DAST Configuration") -- page_title _("DAST Configuration") +- add_to_breadcrumbs _("Security configuration"), project_security_configuration_path(@project) +- breadcrumb_title s_("OnDemandScans|DAST configuration") +- page_title s_("OnDemandScans|DAST configuration") - @content_class = "limit-container-width" unless fluid_layout - content_for :prefetch_asset_tags do diff --git a/ee/app/views/projects/security/dast_profiles/show.html.haml b/ee/app/views/projects/security/dast_profiles/show.html.haml index 8e3a882d6068cf9afec816264e61ffb798967bd4..1dd7f40a9889caea89d4dbb6b2be14a4e39e8749 100644 --- a/ee/app/views/projects/security/dast_profiles/show.html.haml +++ b/ee/app/views/projects/security/dast_profiles/show.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs _('Security Configuration'), project_security_configuration_path(@project) +- add_to_breadcrumbs _('Security configuration'), project_security_configuration_path(@project) - breadcrumb_title s_('DastProfiles|DAST profile library') - page_title s_('DastProfiles|DAST profile library') diff --git a/ee/app/views/projects/security/dast_scanner_profiles/edit.html.haml b/ee/app/views/projects/security/dast_scanner_profiles/edit.html.haml index c53e98b9d8051faab859505755c42c43e4eba475..c13532275f6a9273b8fc0203cfd570b539f55aa9 100644 --- a/ee/app/views/projects/security/dast_scanner_profiles/edit.html.haml +++ b/ee/app/views/projects/security/dast_scanner_profiles/edit.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs _('Security Configuration'), project_security_configuration_path(@project) +- add_to_breadcrumbs _('Security configuration'), project_security_configuration_path(@project) - add_to_breadcrumbs s_('DastProfiles|Manage profiles'), project_security_configuration_profile_library_path(@project, anchor: 'scanner-profiles') - breadcrumb_title s_('DastProfiles|Edit scanner profile') - page_title s_('DastProfiles|Edit scanner profile') diff --git a/ee/app/views/projects/security/dast_scanner_profiles/new.html.haml b/ee/app/views/projects/security/dast_scanner_profiles/new.html.haml index 1892dfe89e569a925f9a8b96276c65f80ef7defa..c4a2c66ee80ff53d841166215c6c82d78a082be2 100644 --- a/ee/app/views/projects/security/dast_scanner_profiles/new.html.haml +++ b/ee/app/views/projects/security/dast_scanner_profiles/new.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs _('Security Configuration'), project_security_configuration_path(@project) +- add_to_breadcrumbs _('Security configuration'), project_security_configuration_path(@project) - add_to_breadcrumbs s_('DastProfiles|Manage profiles'), project_security_configuration_profile_library_path(@project, anchor: 'scanner-profiles') - breadcrumb_title s_('DastProfiles|New scanner profile') - page_title s_('DastProfiles|New scanner profile') diff --git a/ee/app/views/projects/security/dast_site_profiles/edit.html.haml b/ee/app/views/projects/security/dast_site_profiles/edit.html.haml index cc83f91ea22b756710c308cf2ab065be14a12471..3d216bca12836910939a8c5f1c0efa1342a69b15 100644 --- a/ee/app/views/projects/security/dast_site_profiles/edit.html.haml +++ b/ee/app/views/projects/security/dast_site_profiles/edit.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs _('Security Configuration'), project_security_configuration_path(@project) +- add_to_breadcrumbs _('Security configuration'), project_security_configuration_path(@project) - add_to_breadcrumbs s_('DastProfiles|Manage profiles'), project_security_configuration_profile_library_path(@project, anchor: 'site-profiles') - breadcrumb_title s_('DastProfiles|Edit site profile') - page_title s_('DastProfiles|Edit site profile') diff --git a/ee/app/views/projects/security/dast_site_profiles/new.html.haml b/ee/app/views/projects/security/dast_site_profiles/new.html.haml index d6bfac3c0fce05ca8dc6e72c40e561ea411f767a..bba7ea66d799b9308027fb1ed74341fa0dd80f34 100644 --- a/ee/app/views/projects/security/dast_site_profiles/new.html.haml +++ b/ee/app/views/projects/security/dast_site_profiles/new.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs _('Security Configuration'), project_security_configuration_path(@project) +- add_to_breadcrumbs _('Security configuration'), project_security_configuration_path(@project) - add_to_breadcrumbs s_('DastProfiles|Manage profiles'), project_security_configuration_profile_library_path(@project, anchor: 'site-profiles') - breadcrumb_title s_('DastProfiles|New site profile') - page_title s_('DastProfiles|New site profile') diff --git a/ee/app/views/projects/security/sast_configuration/show.html.haml b/ee/app/views/projects/security/sast_configuration/show.html.haml index d10a81896216bcc50d3d3f528bd1fff66ad86ae8..06ef698a153aec3e40d70d5778303eaa6c6d719f 100644 --- a/ee/app/views/projects/security/sast_configuration/show.html.haml +++ b/ee/app/views/projects/security/sast_configuration/show.html.haml @@ -1,5 +1,5 @@ -- add_to_breadcrumbs _("Security Configuration"), project_security_configuration_path(@project) -- breadcrumb_title _("SAST Configuration") -- page_title _("SAST Configuration") +- add_to_breadcrumbs _("Security configuration"), project_security_configuration_path(@project) +- breadcrumb_title s_("SecurityConfiguration|SAST configuration") +- page_title s_("SecurityConfiguration|SAST configuration") .js-sast-configuration{ data: sast_configuration_data(@project) } diff --git a/ee/spec/controllers/projects/security/api_fuzzing_configuration_controller_spec.rb b/ee/spec/controllers/projects/security/api_fuzzing_configuration_controller_spec.rb index 7311e4ae2a23e743a93d75651fc14a2104c39028..81f4111e2e9705fdd482d96b9719e09ff7cd276e 100644 --- a/ee/spec/controllers/projects/security/api_fuzzing_configuration_controller_spec.rb +++ b/ee/spec/controllers/projects/security/api_fuzzing_configuration_controller_spec.rb @@ -49,7 +49,7 @@ it 'renders the side navigation with the correct submenu set as active' do request - expect(response.body).to have_active_sub_navigation('Configuration') + expect(response.body).to have_active_sub_navigation('Security configuration') end end diff --git a/ee/spec/controllers/projects/security/sast_configuration_controller_spec.rb b/ee/spec/controllers/projects/security/sast_configuration_controller_spec.rb index 0727d4c123e78befd3f5db724092594de2ce4f20..dcdb71f20891b15cf223cd8eff64dde9b459b9e0 100644 --- a/ee/spec/controllers/projects/security/sast_configuration_controller_spec.rb +++ b/ee/spec/controllers/projects/security/sast_configuration_controller_spec.rb @@ -51,7 +51,7 @@ it 'renders the side navigation with the correct submenu set as active' do request - expect(response.body).to have_active_sub_navigation('Configuration') + expect(response.body).to have_active_sub_navigation('Security configuration') end end diff --git a/ee/spec/features/projects/navbar_spec.rb b/ee/spec/features/projects/navbar_spec.rb index a8a36cec6b77e6d9d2b8521004c9bd2329aa05ba..9f9e99e069b73dab4a00cf7c1f4d3be0b2dc515c 100644 --- a/ee/spec/features/projects/navbar_spec.rb +++ b/ee/spec/features/projects/navbar_spec.rb @@ -81,7 +81,7 @@ _('Vulnerability report'), s_('OnDemandScans|On-demand scans'), _('Audit events'), - _('Configuration') + _('Security configuration') ] } end diff --git a/ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb index c9344c197bd200851e4d33357f853e3d2294b5c5..fa71e4658efbd324e343219e5d6af8c7b1b74486 100644 --- a/ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb +++ b/ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb @@ -199,7 +199,7 @@ end it 'security configuration link is visible' do - expect(rendered).to have_link('Configuration', href: project_security_configuration_path(project)) + expect(rendered).to have_link('Security configuration', href: project_security_configuration_path(project)) end it 'audit events link is visible' do diff --git a/lib/sidebars/projects/menus/security_compliance_menu.rb b/lib/sidebars/projects/menus/security_compliance_menu.rb index 1e5a7cecdb2d638fb8c7e7783cc563487b3a4cf6..58a7ab4e8f0f285a1ae67bf0786715294cc73a73 100644 --- a/lib/sidebars/projects/menus/security_compliance_menu.rb +++ b/lib/sidebars/projects/menus/security_compliance_menu.rb @@ -33,7 +33,7 @@ def configuration_menu_item end ::Sidebars::MenuItem.new( - title: _('Configuration'), + title: _('Security configuration'), link: project_security_configuration_path(context.project), active_routes: { path: configuration_menu_item_paths }, item_id: :configuration diff --git a/locale/gitlab.pot b/locale/gitlab.pot index ed78b15c54ba99f1c15f18d25f901278edfaef7b..959e36a36dc2dbc1bf4cbaccaf9abffe81e9e37f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1833,9 +1833,6 @@ msgstr "" msgid "API Fuzzing" msgstr "" -msgid "API Fuzzing Configuration" -msgstr "" - msgid "API Help" msgstr "" @@ -10627,9 +10624,6 @@ msgstr "" msgid "Confidentiality" msgstr "" -msgid "Configuration" -msgstr "" - msgid "Configuration help" msgstr "" @@ -12630,9 +12624,6 @@ msgstr "" msgid "DAG visualization requires at least 3 dependent jobs." msgstr "" -msgid "DAST Configuration" -msgstr "" - msgid "DAST configuration not found" msgstr "" @@ -37755,9 +37746,6 @@ msgstr "" msgid "SAML|Your organization's SSO has been connected to your GitLab account" msgstr "" -msgid "SAST Configuration" -msgstr "" - msgid "SCIM|SCIM Token" msgstr "" @@ -38392,9 +38380,6 @@ msgstr "" msgid "Security" msgstr "" -msgid "Security Configuration" -msgstr "" - msgid "Security Dashboard" msgstr "" @@ -38407,6 +38392,9 @@ msgstr "" msgid "Security capabilities" msgstr "" +msgid "Security configuration" +msgstr "" + msgid "Security dashboard" msgstr "" @@ -38539,7 +38527,7 @@ msgstr "" msgid "SecurityConfiguration|SAST Analyzers" msgstr "" -msgid "SecurityConfiguration|SAST Configuration" +msgid "SecurityConfiguration|SAST configuration" msgstr "" msgid "SecurityConfiguration|Secure your project" diff --git a/qa/qa/ee/page/project/sub_menus/security_compliance.rb b/qa/qa/ee/page/project/sub_menus/security_compliance.rb index de6b3ea827e55b6d150bbc925647cdcb5d7ecefc..69126ee7253277c06d70cf2325e18c5327f201d1 100644 --- a/qa/qa/ee/page/project/sub_menus/security_compliance.rb +++ b/qa/qa/ee/page/project/sub_menus/security_compliance.rb @@ -49,7 +49,7 @@ def click_on_vulnerability_report def click_on_security_configuration_link hover_security_compliance do within_submenu do - click_element(:sidebar_menu_item_link, menu_item: 'Configuration') + click_element(:sidebar_menu_item_link, menu_item: 'Security configuration') end end end diff --git a/spec/frontend/security_configuration/components/app_spec.js b/spec/frontend/security_configuration/components/app_spec.js index ddefda2ffc314d212f70fcbca2d73984a9fc7c6f..ee1121abbeeb19218d90430e535469cb1111bf3b 100644 --- a/spec/frontend/security_configuration/components/app_spec.js +++ b/spec/frontend/security_configuration/components/app_spec.js @@ -141,7 +141,7 @@ describe('App component', () => { it('renders main-heading with correct text', () => { const mainHeading = findMainHeading(); expect(mainHeading.exists()).toBe(true); - expect(mainHeading.text()).toContain('Security Configuration'); + expect(mainHeading.text()).toContain('Security configuration'); }); describe('tabs', () => { diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb index 93f387ff619f67a616de75c499f06ec95d88d8d5..e1ac0e3fd0a7a9989256ac4770e6ece439084e21 100644 --- a/spec/support/shared_contexts/navbar_structure_context.rb +++ b/spec/support/shared_contexts/navbar_structure_context.rb @@ -8,7 +8,7 @@ nav_item: _('Security and Compliance'), nav_sub_items: [ (_('Audit events') if Gitlab.ee?), - _('Configuration') + _('Security configuration') ] } end diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb index b529bf7de2c02648d8927d283322a8a8d3d02613..dc9575dc767116f6b70ede511c47320f6fec93cf 100644 --- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb @@ -326,7 +326,7 @@ end it 'security configuration link is visible' do - expect(rendered).to have_link('Configuration', href: project_security_configuration_path(project)) + expect(rendered).to have_link('Security configuration', href: project_security_configuration_path(project)) end end end