Add latest changes from gitlab-org/gitlab@master

29 files changed, 79 insertions, 96 deletions

diff --git a/lib/gitlab/ci/config/entry/default.rb b/lib/gitlab/ci/config/entry/default.rb
index 6200d7c7f87..78297ff5846 100644
--- a/lib/gitlab/ci/config/entry/default.rb
+++ b/lib/gitlab/ci/config/entry/default.rb
@@ -11,8 +11,7 @@ module Gitlab
         #
         class Default < ::Gitlab::Config::Entry::Node
           include ::Gitlab::Config::Entry::Configurable
-
-          DuplicateError = Class.new(Gitlab::Config::Loader::FormatError)
+          include ::Gitlab::Config::Entry::Inheritable
 
           ALLOWED_KEYS = %i[before_script image services
                             after_script cache].freeze
@@ -43,29 +42,16 @@ module Gitlab
 
           helpers :before_script, :image, :services, :after_script, :cache
 
-          def compose!(deps = nil)
-            super(self)
-
-            inherit!(deps)
-          end
-
           private
 
-          def inherit!(deps)
-            return unless deps
+          def overwrite_entry(deps, key, current_entry)
+            inherited_entry = deps[key]
 
-            self.class.nodes.each do |key, factory|
-              next unless factory.inheritable?
-
-              root_entry = deps[key]
-              next unless root_entry.specified?
-
-              if self[key].specified?
-                raise DuplicateError, "#{key} is defined in top-level and `default:` entry"
-              end
-
-              @entries[key] = root_entry
+            if inherited_entry.specified? && current_entry.specified?
+              raise InheritError, "#{key} is defined in top-level and `default:` entry"
             end
+
+            inherited_entry unless current_entry.specified?
           end
         end
       end
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 07d5be86b1e..1298e2d3462 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -10,6 +10,7 @@ module Gitlab
         class Job < ::Gitlab::Config::Entry::Node
           include ::Gitlab::Config::Entry::Configurable
           include ::Gitlab::Config::Entry::Attributable
+          include ::Gitlab::Config::Entry::Inheritable
 
           ALLOWED_WHEN = %w[on_success on_failure always manual delayed].freeze
           ALLOWED_KEYS = %i[tags script only except rules type image services
@@ -73,13 +74,16 @@ module Gitlab
             inherit: true
 
           entry :script, Entry::Commands,
-            description: 'Commands that will be executed in this job.'
+            description: 'Commands that will be executed in this job.',
+            inherit: false
 
           entry :stage, Entry::Stage,
-            description: 'Pipeline stage this job will be executed into.'
+            description: 'Pipeline stage this job will be executed into.',
+            inherit: false
 
           entry :type, Entry::Stage,
-            description: 'Deprecated: stage this job will be executed into.'
+            description: 'Deprecated: stage this job will be executed into.',
+            inherit: false
 
           entry :after_script, Entry::Script,
             description: 'Commands that will be executed when finishing job.',
@@ -99,28 +103,36 @@ module Gitlab
 
           entry :only, Entry::Policy,
             description: 'Refs policy this job will be executed for.',
-            default: Entry::Policy::DEFAULT_ONLY
+            default: Entry::Policy::DEFAULT_ONLY,
+            inherit: false
 
           entry :except, Entry::Policy,
-            description: 'Refs policy this job will be executed for.'
+            description: 'Refs policy this job will be executed for.',
+            inherit: false
 
           entry :rules, Entry::Rules,
-            description: 'List of evaluable Rules to determine job inclusion.'
+            description: 'List of evaluable Rules to determine job inclusion.',
+            inherit: false
 
           entry :variables, Entry::Variables,
-            description: 'Environment variables available for this job.'
+            description: 'Environment variables available for this job.',
+            inherit: false
 
           entry :artifacts, Entry::Artifacts,
-            description: 'Artifacts configuration for this job.'
+            description: 'Artifacts configuration for this job.',
+            inherit: false
 
           entry :environment, Entry::Environment,
-            description: 'Environment configuration for this job.'
+            description: 'Environment configuration for this job.',
+            inherit: false
 
           entry :coverage, Entry::Coverage,
-            description: 'Coverage configuration for this job.'
+            description: 'Coverage configuration for this job.',
+            inherit: false
 
           entry :retry, Entry::Retry,
-               description: 'Retry configuration for this job.'
+            description: 'Retry configuration for this job.',
+            inherit: false
 
           helpers :before_script, :script, :stage, :type, :after_script,
                   :cache, :image, :services, :only, :except, :variables,
@@ -155,8 +167,6 @@ module Gitlab
                 @entries.delete(:except)
               end
             end
-
-            inherit!(deps)
           end
 
           def name
@@ -185,21 +195,8 @@ module Gitlab
 
           private
 
-          # We inherit config entries from `default:`
-          # if the entry has the `inherit: true` flag set
-          def inherit!(deps)
-            return unless deps
-
-            self.class.nodes.each do |key, factory|
-              next unless factory.inheritable?
-
-              default_entry = deps.default[key]
-              job_entry = self[key]
-
-              if default_entry.specified? && !job_entry.specified?
-                @entries[key] = default_entry
-              end
-            end
+          def overwrite_entry(deps, key, current_entry)
+            deps.default[key] unless current_entry.specified?
           end
 
           def to_hash
diff --git a/lib/gitlab/ci/templates/Android-Fastlane.gitlab-ci.yml b/lib/gitlab/ci/templates/Android-Fastlane.gitlab-ci.yml
index be584814271..bf5b485f853 100644
--- a/lib/gitlab/ci/templates/Android-Fastlane.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Android-Fastlane.gitlab-ci.yml
@@ -113,9 +113,9 @@ promoteBeta:
 promoteProduction:
   extends: .promote_job
   stage: production
-  # We only allow production promotion on `master` because
+  # We only allow production promotion on the default branch because
   # it has its own production scoped secret variables
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
   script:
     - bundle exec fastlane promote_beta_to_production
diff --git a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
index 15cdbf63cb1..76453881950 100644
--- a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
@@ -10,7 +10,7 @@ docker-build-master:
     - docker build --pull -t "$CI_REGISTRY_IMAGE" .
     - docker push "$CI_REGISTRY_IMAGE"
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 docker-build:
   # Official docker image.
@@ -24,4 +24,4 @@ docker-build:
     - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
   except:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index 6de7aace8db..6243adcd57c 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -25,7 +25,7 @@ review:
     kubernetes: active
   except:
     refs:
-      - master
+      - $CI_DEFAULT_BRANCH
     variables:
       - $REVIEW_DISABLED
 
@@ -49,7 +49,7 @@ stop_review:
     kubernetes: active
   except:
     refs:
-      - master
+      - $CI_DEFAULT_BRANCH
     variables:
       - $REVIEW_DISABLED
 
@@ -74,7 +74,7 @@ staging:
     url: http://$CI_PROJECT_PATH_SLUG-staging.$KUBE_INGRESS_BASE_DOMAIN
   only:
     refs:
-      - master
+      - $CI_DEFAULT_BRANCH
     kubernetes: active
     variables:
       - $STAGING_ENABLED
@@ -99,7 +99,7 @@ canary:
   when: manual
   only:
     refs:
-      - master
+      - $CI_DEFAULT_BRANCH
     kubernetes: active
     variables:
       - $CANARY_ENABLED
@@ -127,7 +127,7 @@ production:
   <<: *production_template
   only:
     refs:
-      - master
+      - $CI_DEFAULT_BRANCH
     kubernetes: active
   except:
     variables:
@@ -142,7 +142,7 @@ production_manual:
   allow_failure: false
   only:
     refs:
-      - master
+      - $CI_DEFAULT_BRANCH
     kubernetes: active
     variables:
       - $STAGING_ENABLED
@@ -152,7 +152,7 @@ production_manual:
       - $INCREMENTAL_ROLLOUT_ENABLED
       - $INCREMENTAL_ROLLOUT_MODE
 
-# This job implements incremental rollout on for every push to `master`.
+# This job implements incremental rollout for every push to the default branch.
 
 .rollout: &rollout_template
   extends: .auto-deploy
@@ -179,7 +179,7 @@ production_manual:
   # This selectors are backward compatible mode with $INCREMENTAL_ROLLOUT_ENABLED (before 11.4)
   only:
     refs:
-      - master
+      - $CI_DEFAULT_BRANCH
     kubernetes: active
     variables:
       - $INCREMENTAL_ROLLOUT_MODE == "manual"
@@ -194,7 +194,7 @@ production_manual:
   start_in: 5 minutes
   only:
     refs:
-      - master
+      - $CI_DEFAULT_BRANCH
     kubernetes: active
     variables:
       - $INCREMENTAL_ROLLOUT_MODE == "timed"
diff --git a/lib/gitlab/ci/templates/Julia.gitlab-ci.yml b/lib/gitlab/ci/templates/Julia.gitlab-ci.yml
index 32d4e07d398..49f35409cf6 100644
--- a/lib/gitlab/ci/templates/Julia.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Julia.gitlab-ci.yml
@@ -64,7 +64,7 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 # WARNING: This template is using the `julia` images from [Docker
 # Hub][3]. One can use custom Julia images and/or the official ones found
diff --git a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
index 84bb0ff3b33..b9a3c144d28 100644
--- a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
@@ -6,7 +6,7 @@
 # This template will build and test your projects
 # * Caches downloaded dependencies and plugins between invocation.
 # * Verify but don't deploy merge requests.
-# * Deploy built artifacts from master branch only.
+# * Deploy built artifacts from the default branch only.
 
 variables:
   # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
@@ -33,7 +33,7 @@ cache:
   script:
     - 'mvn $MAVEN_CLI_OPTS verify'
   except:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 # Verify merge requests using JDK8
 verify:jdk8:
@@ -42,7 +42,7 @@ verify:jdk8:
 # To deploy packages from CI, create a ci_settings.xml file
 # For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/project/packages/maven_repository.html#creating-maven-packages-with-gitlab-cicd for more details.
 # Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate.
-# For `master` branch run `mvn deploy` automatically.
+# For the default branch run `mvn deploy` automatically.
 deploy:jdk8:
   stage: deploy
   script:
@@ -51,4 +51,4 @@ deploy:jdk8:
       fi
     - 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml'
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Mono.gitlab-ci.yml b/lib/gitlab/ci/templates/Mono.gitlab-ci.yml
index 10fb6be6c39..456b2b1b030 100644
--- a/lib/gitlab/ci/templates/Mono.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Mono.gitlab-ci.yml
@@ -25,7 +25,7 @@ before_script:
 release:
   stage: deploy
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
   artifacts:
     paths:
       - build/release/MyProject.exe
diff --git a/lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml b/lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml
index 65abee1f5eb..e25cede0252 100644
--- a/lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml
@@ -49,7 +49,7 @@ review:
   only:
     - branches
   except:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 stop-review:
   <<: *deploy
@@ -66,7 +66,7 @@ stop-review:
   only:
     - branches
   except:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 staging:
   <<: *deploy
@@ -78,7 +78,7 @@ staging:
     name: staging
     url: http://$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 production:
   <<: *deploy
@@ -91,4 +91,4 @@ production:
     name: production
     url: http://$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Packer.gitlab-ci.yml b/lib/gitlab/ci/templates/Packer.gitlab-ci.yml
index 0a3cf3dcf77..b942b14d474 100644
--- a/lib/gitlab/ci/templates/Packer.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Packer.gitlab-ci.yml
@@ -25,4 +25,4 @@ build:
     - find . -maxdepth 1 -name '*.json' -print0 | xargs -t0n1 packer build
   when: manual
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Brunch.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Brunch.gitlab-ci.yml
index d2dd3fbfb75..3b79a35c320 100644
--- a/lib/gitlab/ci/templates/Pages/Brunch.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Brunch.gitlab-ci.yml
@@ -12,4 +12,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml
index ba422c08614..891cf7d7799 100644
--- a/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml
@@ -10,4 +10,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Gatsby.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Gatsby.gitlab-ci.yml
index a683561a455..6d151ef853f 100644
--- a/lib/gitlab/ci/templates/Pages/Gatsby.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Gatsby.gitlab-ci.yml
@@ -14,4 +14,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
index 92f25280c6e..9d4ee7e1602 100644
--- a/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
@@ -9,4 +9,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml
index 0e206423fa5..63ca721bd4a 100644
--- a/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml
@@ -12,4 +12,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml
index d91a8d7421f..e955628f27e 100644
--- a/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml
@@ -14,4 +14,4 @@ pages:
       - node_modules
     key: project
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Hugo.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Hugo.gitlab-ci.yml
index 9a3ecd1c34f..b7330263845 100644
--- a/lib/gitlab/ci/templates/Pages/Hugo.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Hugo.gitlab-ci.yml
@@ -8,10 +8,10 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 test:
   script:
     - hugo
   except:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Hyde.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Hyde.gitlab-ci.yml
index 7a441a2f70f..f7d393670ad 100644
--- a/lib/gitlab/ci/templates/Pages/Hyde.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Hyde.gitlab-ci.yml
@@ -11,7 +11,7 @@ test:
     - pip install hyde
     - hyde gen
   except:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 pages:
   stage: deploy
@@ -22,4 +22,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Jekyll.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Jekyll.gitlab-ci.yml
index e7dacd3a1fc..c82b70eb9b0 100644
--- a/lib/gitlab/ci/templates/Pages/Jekyll.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Jekyll.gitlab-ci.yml
@@ -17,7 +17,7 @@ test:
     paths:
       - test
   except:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 pages:
   stage: deploy
@@ -27,4 +27,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml
index 2d26b86a328..dda0cc52612 100644
--- a/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml
@@ -34,4 +34,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Lektor.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Lektor.gitlab-ci.yml
index 93ab8e0be0d..ea07a7c3145 100644
--- a/lib/gitlab/ci/templates/Pages/Lektor.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Lektor.gitlab-ci.yml
@@ -9,4 +9,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Metalsmith.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Metalsmith.gitlab-ci.yml
index 6524405133a..a8815c9885a 100644
--- a/lib/gitlab/ci/templates/Pages/Metalsmith.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Metalsmith.gitlab-ci.yml
@@ -13,4 +13,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Middleman.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Middleman.gitlab-ci.yml
index 57ac323dfdf..4a1f357e699 100644
--- a/lib/gitlab/ci/templates/Pages/Middleman.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Middleman.gitlab-ci.yml
@@ -12,7 +12,7 @@ test:
     - bundle install --path vendor
     - bundle exec middleman build
   except:
-    - master
+    - $CI_DEFAULT_BRANCH
 
 pages:
   script:
@@ -24,4 +24,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Nanoc.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Nanoc.gitlab-ci.yml
index 7f037b5f5cf..1b59ee352f6 100644
--- a/lib/gitlab/ci/templates/Pages/Nanoc.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Nanoc.gitlab-ci.yml
@@ -9,4 +9,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/Octopress.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Octopress.gitlab-ci.yml
index 6d912a89bc1..e76363494c1 100644
--- a/lib/gitlab/ci/templates/Pages/Octopress.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Octopress.gitlab-ci.yml
@@ -12,4 +12,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Pages/SwaggerUI.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/SwaggerUI.gitlab-ci.yml
index 8fd08ea7995..9093c7e29e2 100644
--- a/lib/gitlab/ci/templates/Pages/SwaggerUI.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/SwaggerUI.gitlab-ci.yml
@@ -26,4 +26,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Python.gitlab-ci.yml b/lib/gitlab/ci/templates/Python.gitlab-ci.yml
index 00b8b94b574..72753e6e9c1 100644
--- a/lib/gitlab/ci/templates/Python.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Python.gitlab-ci.yml
@@ -48,4 +48,4 @@ pages:
     paths:
       - public
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
diff --git a/lib/gitlab/ci/templates/Swift.gitlab-ci.yml b/lib/gitlab/ci/templates/Swift.gitlab-ci.yml
index ffed7a0fec2..c53ead81c51 100644
--- a/lib/gitlab/ci/templates/Swift.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Swift.gitlab-ci.yml
@@ -22,7 +22,7 @@ archive_project:
     - xcodebuild clean archive -archivePath build/ProjectName -scheme SchemeName
     - xcodebuild -exportArchive -exportFormat ipa -archivePath "build/ProjectName.xcarchive" -exportPath "build/ProjectName.ipa" -exportProvisioningProfile "ProvisioningProfileName"
   only:
-    - master
+    - $CI_DEFAULT_BRANCH
   artifacts:
     paths:
       - build/ProjectName.ipa
diff --git a/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml b/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
index f374bc7e26a..9dae76489e2 100644
--- a/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
@@ -53,4 +53,4 @@ apply:
     - plan
   when: manual
   only:
-    - master
+    - $CI_DEFAULT_BRANCH