1 files changed, 5 insertions, 15 deletions
diff --git a/lib/gitlab/ci/config/external/rules.rb b/lib/gitlab/ci/config/external/rules.rb
index 134306332e6..59e666b8bb5 100644
--- a/lib/gitlab/ci/config/external/rules.rb
+++ b/lib/gitlab/ci/config/external/rules.rb
@@ -17,16 +17,12 @@ module Gitlab
           end
 
           def evaluate(context)
-            if Feature.enabled?(:ci_support_include_rules_when_never, context.project)
-              if @rule_list.nil?
-                Result.new('always')
-              elsif matched_rule = match_rule(context)
-                Result.new(matched_rule.attributes[:when])
-              else
-                Result.new('never')
-              end
+            if @rule_list.nil?
+              Result.new('always')
+            elsif matched_rule = match_rule(context)
+              Result.new(matched_rule.attributes[:when])
             else
-              LegacyResult.new(@rule_list.nil? || match_rule(context))
+              Result.new('never')
             end
           end
 
@@ -55,12 +51,6 @@ module Gitlab
               self.when != 'never'
             end
           end
-
-          LegacyResult = Struct.new(:result) do
-            def pass?
-              !!result
-            end
-          end
         end
       end
     end