Commit 16ee1d98 authored by Stan Hu's avatar Stan Hu

Merge branch 'rf-sast-mr-verbiage' into 'master'

Verbiage tweaks for SAST config MRs

See merge request gitlab-org/gitlab!36831
parents 31045c69 67ea821f
...@@ -18,7 +18,7 @@ module Projects ...@@ -18,7 +18,7 @@ module Projects
@branch_name = project.repository.next_branch("add-sast-config") @branch_name = project.repository.next_branch("add-sast-config")
@commit_params = { @commit_params = {
commit_message: "Add .gitlab-ci.yml to enable SAST", commit_message: "Add .gitlab-ci.yml to enable or configure SAST",
actions: [{ action: "create", file_path: ".gitlab-ci.yml", content: gitlab_ci_yml }] actions: [{ action: "create", file_path: ".gitlab-ci.yml", content: gitlab_ci_yml }]
} }
...@@ -35,7 +35,7 @@ module Projects ...@@ -35,7 +35,7 @@ module Projects
end end
def successful_change_path def successful_change_path
description = "Add .gitlab-ci.yml to enable SAST security scan using the GitLab managed SAST template." description = "Add .gitlab-ci.yml to enable or configure SAST security scanning using the GitLab managed template. You can [add variable overrides](https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings) to customize SAST settings."
merge_request_params = { source_branch: @branch_name, description: description } merge_request_params = { source_branch: @branch_name, description: description }
project_new_merge_request_url(@project, merge_request: merge_request_params) project_new_merge_request_url(@project, merge_request: merge_request_params)
end end
...@@ -49,7 +49,9 @@ module Projects ...@@ -49,7 +49,9 @@ module Projects
def ado_yml def ado_yml
<<-CI_YML.strip_heredoc <<-CI_YML.strip_heredoc
include: include:
- template: Auto-DevOps.gitlab-ci.yml - template: Auto-DevOps.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
# You can override the above template(s) by including variable overrides
# See https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
CI_YML CI_YML
end end
...@@ -59,7 +61,9 @@ module Projects ...@@ -59,7 +61,9 @@ module Projects
- test - test
include: include:
- template: SAST.gitlab-ci.yml - template: SAST.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml
# You can override the above template(s) by including variable overrides
# See https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
CI_YML CI_YML
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment