Add latest changes from gitlab-org/gitlab@master

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.