diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 06:07:02 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 06:07:02 +0000 |
| commit | 9bbb32b29703f3ce33dd35d5101145774b793a6d (patch) | |
| tree | aa1bae0e06dae141228e49b79eada8eaab4cd796 /app/models/concerns/ci/contextable.rb | |
| parent | 16b4f7c9c87d686e9ddb9ee61fea4be4850231a9 (diff) | |
| download | gitlab-ce-9bbb32b29703f3ce33dd35d5101145774b793a6d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/ci/contextable.rb')
| -rw-r--r-- | app/models/concerns/ci/contextable.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/ci/contextable.rb b/app/models/concerns/ci/contextable.rb index 91dda803031..49d6f3d399c 100644 --- a/app/models/concerns/ci/contextable.rb +++ b/app/models/concerns/ci/contextable.rb @@ -78,6 +78,7 @@ module Ci variables.append(key: "CI_JOB_MANUAL", value: 'true') if action? variables.append(key: "CI_NODE_INDEX", value: self.options[:instance].to_s) if self.options&.include?(:instance) variables.append(key: "CI_NODE_TOTAL", value: (self.options&.dig(:parallel) || 1).to_s) + variables.append(key: "CI_DEFAULT_BRANCH", value: project.default_branch) variables.concat(legacy_variables) end end |