diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-05 21:15:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-05 21:15:43 +0300 |
| commit | b2803a5e053c754c7722051aada72ad8330ed811 (patch) | |
| tree | 6a3dba1c08dba9b72cccd28ee263e920ae6dd17b /app/models | |
| parent | 34d79c9c52b94867d0feda5e2beff5299f0640a6 (diff) | |
| parent | f088ffe8f7a8b9ef429f2fb0fbdfd45fa37cde20 (diff) | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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 |