1 files changed, 4 insertions, 18 deletions
diff --git a/app/models/ci/bridge.rb b/app/models/ci/bridge.rb
index a06b920342c..13af5b1f8d1 100644
--- a/app/models/ci/bridge.rb
+++ b/app/models/ci/bridge.rb
@@ -215,14 +215,10 @@ module Ci
     end
 
     def downstream_variables
-      if ::Feature.enabled?(:ci_trigger_forward_variables, project)
-        calculate_downstream_variables
-          .reverse # variables priority
-          .uniq { |var| var[:key] } # only one variable key to pass
-          .reverse
-      else
-        legacy_downstream_variables
-      end
+      calculate_downstream_variables
+        .reverse # variables priority
+        .uniq { |var| var[:key] } # only one variable key to pass
+        .reverse
     end
 
     def target_revision_ref
@@ -268,16 +264,6 @@ module Ci
       }
     end
 
-    def legacy_downstream_variables
-      variables = scoped_variables.concat(pipeline.persisted_variables)
-
-      variables.to_runner_variables.yield_self do |all_variables|
-        yaml_variables.to_a.map do |hash|
-          { key: hash[:key], value: ::ExpandVariables.expand(hash[:value], all_variables) }
-        end
-      end
-    end
-
     def calculate_downstream_variables
       expand_variables = scoped_variables
                            .concat(pipeline.persisted_variables)