diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/controllers/admin/application_settings_controller.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
-rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 41a6616d10c..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 @@ -225,7 +220,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :lets_encrypt_terms_of_service_accepted, :domain_blacklist_file, :raw_blob_request_limit, - :namespace_storage_size_limit, :issues_create_limit, :default_branch_name, disabled_oauth_sign_in_sources: [], |