Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
index 6efb3a4f16a..c4f06c4686d 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
@@ -14,11 +14,9 @@ module Gitlab
 
               return false unless regexp
 
-              if ::Feature.enabled?(:ci_fix_rules_if_comparison_with_regexp_variable)
-                # All variables are evaluated as strings, even if they are regexp strings.
-                # So, we need to convert them to regexp objects.
-                regexp = Lexeme::Pattern.build_and_evaluate(regexp, variables)
-              end
+              # All variables are evaluated as strings, even if they are regexp strings.
+              # So, we need to convert them to regexp objects.
+              regexp = Lexeme::Pattern.build_and_evaluate(regexp, variables)
 
               regexp.scan(text.to_s).present?
             end