Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 7 deletions

diff --git a/lib/gitlab/web_ide/config/entry/terminal.rb b/lib/gitlab/web_ide/config/entry/terminal.rb
index 514fca1435c..ec07023461f 100644
--- a/lib/gitlab/web_ide/config/entry/terminal.rb
+++ b/lib/gitlab/web_ide/config/entry/terminal.rb
@@ -55,7 +55,7 @@ module Gitlab
             {
               tag_list: tags || [],
               yaml_variables: yaml_variables, # https://gitlab.com/gitlab-org/gitlab/-/issues/300581
-              job_variables: job_variables,
+              job_variables: yaml_variables,
               options: {
                 image: image_value,
                 services: services_value,
@@ -74,12 +74,6 @@ module Gitlab
               end
             end
           end
-
-          def job_variables
-            return unless ::Feature.enabled?(:ci_workflow_rules_variables, default_enabled: :yaml)
-
-            yaml_variables
-          end
         end
       end
     end