summaryrefslogtreecommitdiff
path: root/app/controllers/admin/application_settings_controller.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-10-05 12:23:38 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-10-05 12:23:38 -0400
commitfc59c45d58124c4fc23d62ad2ed65cbfd6cb3563 (patch)
tree69f2ac4aaf43599641a395c6f936e717ff3f5d02 /app/controllers/admin/application_settings_controller.rb
parent8a78c4ea06c7bd3a4c6a0ea9943891327b90cd35 (diff)
downloadgitlab-ce-fc59c45d58124c4fc23d62ad2ed65cbfd6cb3563.tar.gz
Remove the option to disable CIrs-remove-ci-disable
This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
-rw-r--r--app/controllers/admin/application_settings_controller.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 5f70582cbb7..7c134d2ec9b 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -56,7 +56,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:restricted_signup_domains_raw,
:version_check_enabled,
:user_oauth_applications,
- :ci_enabled,
restricted_visibility_levels: [],
import_sources: []
)