Merge branch 'agulina-master-patch-73409' into 'master'

Use a default branch that's not "master" in template See merge request gitlab-org/gitlab!55949

Merge branch 'agulina-master-patch-73409' into 'master'
Use a default branch that's not "master" in template See merge request gitlab-org/gitlab!55949
f1650c86 · Michael Kozono · e09c41b5 · 0953ddce · f1650c86
Commit f1650c86 authored Mar 11, 2021 by Michael Kozono
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml +2 -1

No files found.
--- a/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml
@@ -52,7 +52,8 @@ cache:
    - gitlab-terraform apply
  when: manual
  only:
-    - master
+    variables:
+      - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 .destroy: &destroy
  stage: cleanup