Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 2 insertions, 32 deletions

diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index f960cec1f26..ecc2c5cb729 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -122,39 +122,9 @@ module Gitlab
                      :needs, :retry, :parallel, :start_in,
                      :interruptible, :timeout, :resource_group, :release
 
-          Matcher = Struct.new(:name, :config) do
-            def applies?
-              job_is_not_hidden? &&
-              config_is_a_hash? &&
-              has_job_keys?
-            end
-
-            private
-
-            def job_is_not_hidden?
-              !name.to_s.start_with?('.')
-            end
-
-            def config_is_a_hash?
-              config.is_a?(Hash)
-            end
-
-            def has_job_keys?
-              if name == :default
-                config.key?(:script)
-              else
-                (ALLOWED_KEYS & config.keys).any?
-              end
-            end
-          end
-
           def self.matching?(name, config)
-            if Gitlab::Ci::Features.job_entry_matches_all_keys?
-              Matcher.new(name, config).applies?
-            else
-              !name.to_s.start_with?('.') &&
-                config.is_a?(Hash) && config.key?(:script)
-            end
+            !name.to_s.start_with?('.') &&
+              config.is_a?(Hash) && config.key?(:script)
           end
 
           def self.visible?