Commit ca116e6a authored by Jose Vargas's avatar Jose Vargas Committed by Jose Ivan Vargas

Remove ci_instance_variables_ui feature flag

This removes the aforementioned feature flag
to enable the instance variables feature
by default
parent f4b8ac67
...@@ -3,8 +3,7 @@ import { parseBoolean } from '~/lib/utils/common_utils'; ...@@ -3,8 +3,7 @@ import { parseBoolean } from '~/lib/utils/common_utils';
import CiVariableSettings from './components/ci_variable_settings.vue'; import CiVariableSettings from './components/ci_variable_settings.vue';
import createStore from './store'; import createStore from './store';
export default (containerId = 'js-ci-project-variables') => { const mountCiVariableListApp = (containerEl) => {
const containerEl = document.getElementById(containerId);
const { const {
endpoint, endpoint,
projectId, projectId,
...@@ -43,3 +42,8 @@ export default (containerId = 'js-ci-project-variables') => { ...@@ -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);
};
...@@ -4,9 +4,7 @@ import initSearchSettings from '~/search_settings'; ...@@ -4,9 +4,7 @@ import initSearchSettings from '~/search_settings';
import selfMonitor from '~/self_monitor'; import selfMonitor from '~/self_monitor';
import initSettingsPanels from '~/settings_panels'; import initSettingsPanels from '~/settings_panels';
if (gon.features?.ciInstanceVariablesUi) { initVariableList('js-instance-variables');
initVariableList('js-instance-variables');
}
selfMonitor(); selfMonitor();
// Initialize expandable settings panels // Initialize expandable settings panels
initSettingsPanels(); initSettingsPanels();
......
...@@ -13,10 +13,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -13,10 +13,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
before_action :whitelist_query_limiting, only: [:usage_data] before_action :whitelist_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, [ feature_category :not_owned, [
:general, :reporting, :metrics_and_profiling, :network, :general, :reporting, :metrics_and_profiling, :network,
:preferences, :update, :reset_health_check_token :preferences, :update, :reset_health_check_token
......
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
- page_title _("CI/CD") - page_title _("CI/CD")
- @content_class = "limit-container-width" unless fluid_layout - @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?) }
%section.settings.no-animate#js-ci-cd-variables{ class: ('expanded' if expanded_by_default?) }
.settings-header .settings-header
= render 'admin/application_settings/ci/header', expanded: expanded_by_default? = render 'admin/application_settings/ci/header', expanded: expanded_by_default?
.settings-content .settings-content
......
---
title: Enable the instance variables UI
merge_request: 56255
author:
type: other
---
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
...@@ -10,10 +10,6 @@ module Gitlab ...@@ -10,10 +10,6 @@ module Gitlab
::Feature.enabled?(:ci_artifacts_exclude, default_enabled: true) ::Feature.enabled?(:ci_artifacts_exclude, default_enabled: true)
end end
def self.instance_variables_ui_enabled?
::Feature.enabled?(:ci_instance_variables_ui, default_enabled: true)
end
def self.pipeline_latest? def self.pipeline_latest?
::Feature.enabled?(:ci_pipeline_latest, default_enabled: true) ::Feature.enabled?(:ci_pipeline_latest, default_enabled: true)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment