Merge branch 'jivanvl-remove-ci-instance-variables-ui-ff' into 'master'

Remove ci_instance_variables_ui feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!56255

app/assets/javascripts/ci_variable_list/index.js

@@ -3,8 +3,7 @@ import { parseBoolean } from '~/lib/utils/common_utils';
 import CiVariableSettings from './components/ci_variable_settings.vue';
 import createStore from './store';
 
-export default (containerId = 'js-ci-project-variables') => {
-  const containerEl = document.getElementById(containerId);
+const mountCiVariableListApp = (containerEl) => {
   const {
     endpoint,
     projectId,
@@ -43,3 +42,8 @@ export default (containerId = 'js-ci-project-variables') => {
     },
   });
 };
+
+export default () => {
+  const el = document.querySelector('#js-ci-project-variables');
+  return !el ? {} : mountCiVariableListApp(el);
+};

app/assets/javascripts/pages/admin/application_settings/index.js

@@ -4,9 +4,7 @@ import initSearchSettings from '~/search_settings';
 import selfMonitor from '~/self_monitor';
 import initSettingsPanels from '~/settings_panels';
 
-if (gon.features?.ciInstanceVariablesUi) {
-  initVariableList('js-instance-variables');
-}
+initVariableList('js-instance-variables');
 selfMonitor();
 // Initialize expandable settings panels
 initSettingsPanels();

app/controllers/admin/application_settings_controller.rb

@@ -13,10 +13,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
 
   before_action :disable_query_limiting, only: [:usage_data]
 
-  before_action only: [:ci_cd] do
-    push_frontend_feature_flag(:ci_instance_variables_ui, default_enabled: true)
-  end
-
   feature_category :not_owned, [
                      :general, :reporting, :metrics_and_profiling, :network,
                      :preferences, :update, :reset_health_check_token

app/views/admin/application_settings/ci_cd.html.haml

@@ -2,16 +2,15 @@
 - page_title _("CI/CD")
 - @content_class = "limit-container-width" unless fluid_layout
 
-- if ::Gitlab::Ci::Features.instance_variables_ui_enabled?
-  %section.settings.no-animate#js-ci-cd-variables{ class: ('expanded' if expanded_by_default?) }
-    .settings-header
-      = render 'admin/application_settings/ci/header', expanded: expanded_by_default?
-    .settings-content
-      - if ci_variable_protected_by_default?
-        %p.settings-message.text-center
-          - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable') }
-          = s_('Environment variables on this GitLab instance are configured to be %{link_start}protected%{link_end} by default.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
-      #js-instance-variables{ data: { endpoint: admin_ci_variables_path, group: 'true', maskable_regex: ci_variable_maskable_regex, protected_by_default: ci_variable_protected_by_default?.to_s} }
+%section.settings.no-animate#js-ci-cd-variables{ class: ('expanded' if expanded_by_default?) }
+  .settings-header
+    = render 'admin/application_settings/ci/header', expanded: expanded_by_default?
+  .settings-content
+    - if ci_variable_protected_by_default?
+      %p.settings-message.text-center
+        - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable') }
+        = s_('Environment variables on this GitLab instance are configured to be %{link_start}protected%{link_end} by default.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
+    #js-instance-variables{ data: { endpoint: admin_ci_variables_path, group: 'true', maskable_regex: ci_variable_maskable_regex, protected_by_default: ci_variable_protected_by_default?.to_s} }
 
 %section.settings.as-ci-cd.no-animate#js-ci-cd-settings{ class: ('expanded' if expanded_by_default?) }
   .settings-header

changelogs/unreleased/jivanvl-remove-ci-instance-variables-ui-ff.yml

+---
+title: Enable the instance variables UI
+merge_request: 56255
+author:
+type: other

config/feature_flags/development/ci_instance_variables_ui.yml

----
-name: ci_instance_variables_ui
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33510
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299879
-milestone: '13.1'
-type: development
-group: group::continuous integration
-default_enabled: true

lib/gitlab/ci/features.rb

@@ -10,10 +10,6 @@ module Gitlab
         ::Feature.enabled?(:ci_artifacts_exclude, default_enabled: true)
       end
 
-      def self.instance_variables_ui_enabled?
-        ::Feature.enabled?(:ci_instance_variables_ui, default_enabled: true)
-      end
-
       def self.pipeline_latest?
         ::Feature.enabled?(:ci_pipeline_latest, default_enabled: true)
       end