diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2019-02-26 17:32:23 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-02-26 17:32:23 +0000 |
commit | 7b445f9b15c31f7b2b53561901183ab23db2d636 (patch) | |
tree | 21640c40aea443139e1a9e31b2ea606115cf9916 /lib | |
parent | 48e6db0dad6f256e8423e0bd6c9b254803f50ccf (diff) | |
download | gitlab-ce-7b445f9b15c31f7b2b53561901183ab23db2d636.tar.gz |
Revert "Merge branch '13784-simple-masking-of-protected-variables-in-logs' into 'master'"
This reverts merge request !25293
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/variables/collection/item.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/gitlab/ci/variables/collection/item.rb b/lib/gitlab/ci/variables/collection/item.rb index 833aa75adb5..e3e4e62cc02 100644 --- a/lib/gitlab/ci/variables/collection/item.rb +++ b/lib/gitlab/ci/variables/collection/item.rb @@ -5,12 +5,12 @@ module Gitlab module Variables class Collection class Item - def initialize(key:, value:, public: true, file: false, masked: false) + def initialize(key:, value:, public: true, file: false) raise ArgumentError, "`#{key}` must be of type String or nil value, while it was: #{value.class}" unless value.is_a?(String) || value.nil? @variable = { - key: key, value: value, public: public, file: file, masked: masked + key: key, value: value, public: public, file: file } end @@ -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 |