Merge branch 'aqualls-sast-mr-language' into 'master'

Update 'Merge Request' in SAST UI page

See merge request gitlab-org/gitlab!75152

app/assets/javascripts/vue_shared/security_configuration/components/manage_via_mr.vue

@@ -85,7 +85,7 @@ export default {
     );
   },
   i18n: {
-    buttonLabel: s__('SecurityConfiguration|Configure via Merge Request'),
+    buttonLabel: s__('SecurityConfiguration|Configure with a merge request'),
     noSuccessPathError: s__(
       'SecurityConfiguration|%{featureName} merge request creation mutation failed',
     ),

doc/user/application_security/configuration/index.md

@@ -46,14 +46,14 @@ You can configure the following security controls:
   - Select **Manage scans** to manage the saved DAST scans, site profiles, and scanner profiles.
     For more details, read [DAST on-demand scans](../dast/index.md#on-demand-scans).
 - [Dependency Scanning](../dependency_scanning/index.md)
-  - Select **Configure via Merge Request** to create a merge request with the changes required to
+  - Select **Configure with a merge request** to create a merge request with the changes required to
     enable Dependency Scanning. For more details, see [Enable Dependency Scanning via an automatic merge request](../dependency_scanning/index.md#enable-dependency-scanning-via-an-automatic-merge-request).
 - [Container Scanning](../container_scanning/index.md)
   - Can be configured with `.gitlab-ci.yml`. For more details, read [Container Scanning](../../../user/application_security/container_scanning/index.md#configuration).
 - [Cluster Image Scanning](../cluster_image_scanning/index.md)
   - Can be configured with `.gitlab-ci.yml`. For more details, read [Cluster Image Scanning](../../../user/application_security/cluster_image_scanning/#configuration).
 - [Secret Detection](../secret_detection/index.md)
-  - Select **Configure via Merge Request** to create a merge request with the changes required to
+  - Select **Configure with a merge request** to create a merge request with the changes required to
     enable Secret Detection. For more details, read [Enable Secret Detection via an automatic merge request](../secret_detection/index.md#enable-secret-detection-via-an-automatic-merge-request).
 - [API Fuzzing](../api_fuzzing/index.md)
   - Select **Enable API Fuzzing** to use API Fuzzing for the current project. For more details, read [API Fuzzing](../../../user/application_security/api_fuzzing/index.md#enable-web-api-fuzzing).

doc/user/application_security/dependency_scanning/index.md

@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 INFO:
 Try out Dependency Scanning in GitLab Ultimate.
-[It's free for 30 days](https://about.gitlab.com/free-trial?glm_source=docs.gitlab.com&glm_content=u-dependency-scanning-docs). 
+[It's free for 30 days](https://about.gitlab.com/free-trial?glm_source=docs.gitlab.com&glm_content=u-dependency-scanning-docs).
 
 The Dependency Scanning feature can automatically find security vulnerabilities in your
 dependencies while you're developing and testing your applications. For example, dependency scanning
@@ -444,7 +444,7 @@ from the Security Configuration page.
 
 1. In the project where you want to enable Dependency Scanning, navigate to
    **Security & Compliance > Configuration**.
-1. In the **Dependency Scanning** row, select **Configure via Merge Request**.
+1. In the **Dependency Scanning** row, select **Configure with a merge request**.
 
 This automatically creates a merge request with the changes necessary to enable Dependency Scanning
 that you can review and merge to complete the configuration.

doc/user/application_security/iac_scanning/index.md

@@ -39,7 +39,7 @@ GitLab IaC scanning supports a variety of IaC configuration files. Our IaC secur
 
 ### Making IaC analyzers available to all GitLab tiers
 
-All open source (OSS) analyzers are availibile with the GitLab Free tier. Future propietary analyzers may be restricted to higher tiers. 
+All open source (OSS) analyzers are availibile with the GitLab Free tier. Future propietary analyzers may be restricted to higher tiers.
 
 #### Summary of features per tier
 
@@ -84,7 +84,7 @@ from the Security Configuration page:
 
 1. On the top bar, select **Menu > Projects** and find your project.
 1. On the left sidebar, select **Security & Compliance > Configuration**.
-1. In the **Infrastructure as Code (IaC) Scanning** row, select **Configure via Merge Request**.
+1. In the **Infrastructure as Code (IaC) Scanning** row, select **Configure with a merge request**.
 
 This automatically creates a merge request with the changes necessary to enable IaC Scanning
 that you can review and merge to complete the configuration.

doc/user/application_security/secret_detection/index.md

@@ -123,10 +123,10 @@ from the Security Configuration page.
 
 1. In the project where you want to enable Secret Detection, go to
    **Security & Compliance > Configuration**.
-1. In the **Secret Detection** row, select **Configure via Merge Request**.
+1. In the **Secret Detection** row, select **Configure with a merge request**.
 
 This automatically creates a merge request with the changes necessary to enable Secret Detection
-that you can review and merge to complete the configuration. 
+that you can review and merge to complete the configuration.
 
 NOTE:
 The configuration tool works best with no existing `.gitlab-ci.yml` file, or with a minimal

ee/spec/features/projects/security/user_views_security_configuration_spec.rb

@@ -55,9 +55,9 @@ RSpec.describe 'User sees Security Configuration table', :js do
         within_sast_iac_card do
           expect(page).to have_text('Infrastructure as Code (IaC) Scanning')
           expect(page).to have_text('Not enabled')
-          expect(page).to have_button('Configure via Merge Request')
+          expect(page).to have_button('Configure with a merge request')
 
-          click_button 'Configure via Merge Request'
+          click_button 'Configure with a merge request'
           wait_for_requests
 
           expect(current_path).to eq(project_new_merge_request_path(project))

locale/gitlab.pot

@@ -30776,7 +30776,7 @@ msgstr ""
 msgid "SecurityConfiguration|Configure %{feature}"
 msgstr ""
 
-msgid "SecurityConfiguration|Configure via Merge Request"
+msgid "SecurityConfiguration|Configure with a merge request"
 msgstr ""
 
 msgid "SecurityConfiguration|Copy code and open .gitlab-ci.yml file"