Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 0 insertions, 11 deletions

diff --git a/lib/gitlab/ci/config/entry/inherit/variables.rb b/lib/gitlab/ci/config/entry/inherit/variables.rb
index aa68833bdb8..adef4d1636a 100644
--- a/lib/gitlab/ci/config/entry/inherit/variables.rb
+++ b/lib/gitlab/ci/config/entry/inherit/variables.rb
@@ -13,9 +13,6 @@ module Gitlab
             strategy :ArrayStrategy, if: -> (config) { config.is_a?(Array) }
 
             class BooleanStrategy < ::Gitlab::Config::Entry::Boolean
-              def inherit?(_key)
-                value
-              end
             end
 
             class ArrayStrategy < ::Gitlab::Config::Entry::Node
@@ -25,20 +22,12 @@ module Gitlab
                 validates :config, type: Array
                 validates :config, array_of_strings: true
               end
-
-              def inherit?(key)
-                value.include?(key.to_s)
-              end
             end
 
             class UnknownStrategy < ::Gitlab::Config::Entry::Node
               def errors
                 ["#{location} should be a bool or array of strings"]
               end
-
-              def inherit?(key)
-                false
-              end
             end
           end
         end