diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 21:06:31 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 21:06:31 +0300 |
| commit | f088ffe8f7a8b9ef429f2fb0fbdfd45fa37cde20 (patch) | |
| tree | d3bf78bcd464177800cfd466f9ebda114e8d8a71 /app/models | |
| parent | 3eef0e18e0d4561c320b4a5d9c17d7ae7aaa3d42 (diff) | |
| parent | fc59c45d58124c4fc23d62ad2ed65cbfd6cb3563 (diff) | |
Merge branch 'rs-remove-ci-disable'
See merge request !1512
Diffstat (limited to 'app/models')
| -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 |