diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-16 00:08:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-16 00:08:21 +0300 |
| commit | 95ab36cd97f9f527ad624f80c6830eca28eeb7bf (patch) | |
| tree | e9691cf3f4786201040268327a967b63b74ff0c0 /app/models/concerns/ci | |
| parent | 31a340adabe75f8b02cca462ab8aa857ff62f772 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/ci')
| -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 5ff537a7837..b19f4518fb2 100644 --- a/app/models/concerns/ci/contextable.rb +++ b/app/models/concerns/ci/contextable.rb @@ -18,6 +18,7 @@ module Ci variables.concat(deployment_variables(environment: environment)) variables.concat(yaml_variables) variables.concat(user_variables) + variables.concat(dependency_variables) if Feature.enabled?(:ci_dependency_variables, project) variables.concat(secret_group_variables) variables.concat(secret_project_variables(environment: environment)) variables.concat(trigger_request.user_variables) if trigger_request |