diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-29 09:10:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-29 09:10:11 +0000 |
commit | a056c4d05f51985f2228dcb66d302279855e9b3c (patch) | |
tree | 122bdfc8939127459598cc0533a80ba730d16443 /scripts/utils.sh | |
parent | 46e5b02ab269881cadff70dae50795d088395744 (diff) | |
download | gitlab-ce-a056c4d05f51985f2228dcb66d302279855e9b3c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/utils.sh')
-rw-r--r-- | scripts/utils.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/utils.sh b/scripts/utils.sh index 85c311087ea..ed27edcadb2 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -172,5 +172,5 @@ function danger_as_local() { # Force danger to skip CI source GitLab and fallback to "local only git repo". unset GITLAB_CI # We need to base SHA to help danger determine the base commit for this shallow clone. - bundle exec danger dry_run --fail-on-errors=true --verbose --base="${CI_MERGE_REQUEST_DIFF_BASE_SHA}" --head="${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" + bundle exec danger dry_run --fail-on-errors=true --verbose --base="${CI_MERGE_REQUEST_DIFF_BASE_SHA}" --head="${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA:-$CI_COMMIT_SHA}" } |