Merge branch 'allow-merge-commits-secret-detection' into 'master'

Allow merge commits for SD

See merge request gitlab-org/gitlab!82546

lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml

@@ -51,7 +51,7 @@ secret_detection:
       else
         # determine commit range so that we can fetch the appropriate depth
         # check the exit code to determine if we need to limit the commit_list.txt to CI_COMMIT_SHA.
-        if ! git log --no-merges --pretty=format:"%H" ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA} >${CI_COMMIT_SHA}_commit_list.txt;
+        if ! git log --pretty=format:"%H" ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA} >${CI_COMMIT_SHA}_commit_list.txt;
         then
           echo "unable to determine commit range, limiting to ${CI_COMMIT_SHA}"
           echo ${CI_COMMIT_SHA} >${CI_COMMIT_SHA}_commit_list.txt