Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ce04cea1
Commit
ce04cea1
authored
Mar 09, 2022
by
Zach Rice
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow merge commits for SD
Changelog: fixed
parent
d9849068
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml
lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml
+1
-1
No files found.
lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml
View file @
ce04cea1
...
@@ -51,7 +51,7 @@ secret_detection:
...
@@ -51,7 +51,7 @@ secret_detection:
else
else
# determine commit range so that we can fetch the appropriate depth
# 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.
# 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
then
echo "unable to determine commit range, limiting to ${CI_COMMIT_SHA}"
echo "unable to determine commit range, limiting to ${CI_COMMIT_SHA}"
echo ${CI_COMMIT_SHA} >${CI_COMMIT_SHA}_commit_list.txt
echo ${CI_COMMIT_SHA} >${CI_COMMIT_SHA}_commit_list.txt
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment