diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-07-06 15:45:38 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-07-06 15:45:38 +0800 |
| commit | ad8910bb2faccf7ed69d5820b0ce4d5344264002 (patch) | |
| tree | 441325a11cb26b3f1854f4dc1fc1d6081f5e9826 /app/models/project.rb | |
| parent | 6c15905c3bd11209858eac8870ffa9211f08f157 (diff) | |
| download | gitlab-ce-34716-environment-specific-variables-ce.tar.gz | |
Backports for ee-211234716-environment-specific-variables-ce
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 315e1a6cb17..a2e079a59fe 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1315,7 +1315,8 @@ class Project < ActiveRecord::Base variables end - def secret_variables_for(ref) + def secret_variables_for(ref:, environment: nil) + # EE would use the environment if protected_for?(ref) variables else |