diff options
Diffstat (limited to 'app/controllers/admin')
-rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 9 | ||||
-rw-r--r-- | app/controllers/admin/integrations_controller.rb | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 09a001aaa85..3a5b8b2862e 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -16,7 +16,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController push_frontend_feature_flag(:ci_instance_variables_ui, default_enabled: true) end - VALID_SETTING_PANELS = %w(general integrations repository + VALID_SETTING_PANELS = %w(general repository ci_cd reporting metrics_and_profiling network preferences).freeze @@ -32,12 +32,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end def integrations - if Feature.enabled?(:instance_level_integrations) - @integrations = Service.find_or_initialize_instances.sort_by(&:title) - else - set_application_setting - perform_update if submitted? - end + @integrations = Service.find_or_initialize_instances.sort_by(&:title) end def update diff --git a/app/controllers/admin/integrations_controller.rb b/app/controllers/admin/integrations_controller.rb index 4f3be43d14d..b2d5a2d130c 100644 --- a/app/controllers/admin/integrations_controller.rb +++ b/app/controllers/admin/integrations_controller.rb @@ -12,7 +12,7 @@ class Admin::IntegrationsController < Admin::ApplicationController end def integrations_enabled? - Feature.enabled?(:instance_level_integrations) + true end def scoped_edit_integration_path(integration) |