diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-10-05 12:23:38 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-05 12:23:38 -0400 |
commit | fc59c45d58124c4fc23d62ad2ed65cbfd6cb3563 (patch) | |
tree | 69f2ac4aaf43599641a395c6f936e717ff3f5d02 /app/models/application_setting.rb | |
parent | 8a78c4ea06c7bd3a4c6a0ea9943891327b90cd35 (diff) | |
download | gitlab-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/models/application_setting.rb')
-rw-r--r-- | app/models/application_setting.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 784f5c96a0a..c8841178e93 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -83,8 +83,7 @@ class ApplicationSetting < ActiveRecord::Base default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'], default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'], restricted_signup_domains: Settings.gitlab['restricted_signup_domains'], - import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'], - ci_enabled: Settings.gitlab_ci['enabled'] + import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'] ) end |