diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-06 09:10:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-06 09:10:11 +0300 |
commit | 0a0e8803b0e3e2fb83d74c9bafc32f4e9d825bcc (patch) | |
tree | 12ca59ec66c2ec7d405101869a7384d2034d308d /doc | |
parent | 806b829e76120085d80759dabc110f0328cfb7ac (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/development/code_review.md | 4 | ||||
-rw-r--r-- | doc/user/application_security/index.md | 13 |
2 files changed, 4 insertions, 13 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 75e2dc69821..3bd0a784ffb 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -432,6 +432,10 @@ When in doubt, ask someone from `@gitlab-com/gl-security/appsec` to review the m enough to `master`. - When you set the MR to "Merge When Pipeline Succeeds", you should take over subsequent revisions for anything that would be spotted after that. +- For merge requests that have had [Squash and + merge](../user/project/merge_requests/squash_and_merge.md#squash-and-merge) set, + the squashed commit’s default commit message is taken from the merge request title. + You're encouraged to [select a commit with a more informative commit message](../user/project/merge_requests/squash_and_merge.md#overview) before merging. Thanks to **Pipeline for Merged Results**, authors no longer have to rebase their branch as frequently anymore (only when there are conflicts) because the Merge diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md index b552a3f9a1f..6caab1ee383 100644 --- a/doc/user/application_security/index.md +++ b/doc/user/application_security/index.md @@ -104,19 +104,6 @@ rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" ``` -## Security Scanning with Auto DevOps - -When [Auto DevOps](../../topics/autodevops/) is enabled, all GitLab Security scanning tools are configured using default settings. - -- [Auto SAST](../../topics/autodevops/stages.md#auto-sast) -- [Auto Secret Detection](../../topics/autodevops/stages.md#auto-secret-detection) -- [Auto DAST](../../topics/autodevops/stages.md#auto-dast) -- [Auto Dependency Scanning](../../topics/autodevops/stages.md#auto-dependency-scanning) -- [Auto License Compliance](../../topics/autodevops/stages.md#auto-license-compliance) -- [Auto Container Scanning](../../topics/autodevops/stages.md#auto-container-scanning) - -While you cannot directly customize Auto DevOps, you can [include the Auto DevOps template in your project's `.gitlab-ci.yml` file](../../topics/autodevops/customize.md#customizing-gitlab-ciyml). - ## View security scan information in merge requests **(FREE)** > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/4393) in GitLab Free 13.5. |