diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-28 18:09:15 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-28 18:09:15 +0300 |
| commit | 6246979a8659cef67533a5033755a45ad72d30c5 (patch) | |
| tree | 8486a6d0621782c2a496b975479c02e7d124086a /lib | |
| parent | 536d96a3e02daceca8398745cd27ab1e0f56711d (diff) | |
| parent | 07b5c50381884e06322a0dea3363f87bf62f399a (diff) | |
Merge branch '60945-masked-variable-still-printed-in-log-output-on-gitlab-com' into 'master'
Resolve "Masked Variable still printed in log output on gitlab.com"
Closes #60945
See merge request gitlab-org/gitlab-ce!27768
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/variables/collection/item.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ci/variables/collection/item.rb b/lib/gitlab/ci/variables/collection/item.rb index 833aa75adb5..aab10aef398 100644 --- a/lib/gitlab/ci/variables/collection/item.rb +++ b/lib/gitlab/ci/variables/collection/item.rb @@ -27,13 +27,9 @@ module Gitlab # don't expose `file` attribute at all (stems from what the runner # expects). # - # If the `variable_masking` feature is enabled we expose the `masked` - # attribute, otherwise it's not exposed. - # def to_runner_variable @variable.reject do |hash_key, hash_value| - (hash_key == :file && hash_value == false) || - (hash_key == :masked && !Feature.enabled?(:variable_masking)) + hash_key == :file && hash_value == false end end |