summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.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 /config/initializers/1_settings.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 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 4e4a8ecbdb3..4c78bd6e2fa 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -178,7 +178,6 @@ Settings.gitlab['import_sources'] ||= ['github','bitbucket','gitlab','gitorious'
# CI
#
Settings['gitlab_ci'] ||= Settingslogic.new({})
-Settings.gitlab_ci['enabled'] = true if Settings.gitlab_ci['enabled'].nil?
Settings.gitlab_ci['all_broken_builds'] = true if Settings.gitlab_ci['all_broken_builds'].nil?
Settings.gitlab_ci['add_pusher'] = false if Settings.gitlab_ci['add_pusher'].nil?
Settings.gitlab_ci['url'] ||= Settings.send(:build_gitlab_ci_url)