summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-30 15:11:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-30 15:11:08 +0000
commit2cba3ab8e7b2d6b32be6910d15b53860f2c2140e (patch)
tree28bd2516c6030e038bb8ea1143cc6ec11f953fd0 /.gitlab-ci.yml
parenta10d237d37e78cbe84f72fffaeff74dc73f1e68f (diff)
downloadgitlab-ce-2cba3ab8e7b2d6b32be6910d15b53860f2c2140e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38115beec69..7e4f1a02646 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ workflow:
when: never
# For merge requests, create a pipeline.
- if: '$CI_MERGE_REQUEST_IID'
- # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
+ # For `$CI_DEFAULT_BRANCH` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
# For tags, create a pipeline.
- if: '$CI_COMMIT_TAG'