diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-10 15:54:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-09-10 15:54:51 +0000 |
| commit | 13bb9ed77f405c5f6ee4fdbc964ecf635c9a223f (patch) | |
| tree | fbe703eedd3e1864a8ca769a217b50dd21e68f0b | |
| parent | d01cbe0c8baf0ab630cf5e5d28087e91c8679b70 (diff) | |
| parent | e672c0128a232cd25112de4e84528112ec2e59d9 (diff) | |
| download | gitlab-ce-13bb9ed77f405c5f6ee4fdbc964ecf635c9a223f.tar.gz | |
Merge branch '21814-fix' into 'master'
Pull import sources from Gitlab::ImportSources
## What does this MR do?
`ApplicationSettings.create_from_defaults` defines an array of import sources, but we should be pulling them from `Gitlab::ImportSources.options` since that's what they're validated against.
## What are the relevant issue numbers?
Closes #21814
See merge request !6293
| -rw-r--r-- | app/models/application_setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 246477ffe88..55d2e07de08 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -146,7 +146,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'], domain_whitelist: Settings.gitlab['domain_whitelist'], - import_sources: %w[github bitbucket gitlab google_code fogbugz git gitlab_project], + import_sources: Gitlab::ImportSources.values, shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'], max_artifacts_size: Settings.artifacts['max_size'], require_two_factor_authentication: false, |