diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-11 12:52:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-11 12:52:33 +0000 |
| commit | eeacda2297131067d0f0e7c5801d6700175520f9 (patch) | |
| tree | 7472511caafc5eb7e521cf4c97c68eada6b5590a | |
| parent | cd3985df97213655be652118184571daf3098456 (diff) | |
| parent | ba6c309f4abe443d80ed6ad731451f02bfc8d707 (diff) | |
| download | gitlab-ce-eeacda2297131067d0f0e7c5801d6700175520f9.tar.gz | |
Merge branch 'import-sources-fix' into 'master'
Read import sources from setting at first initialization
See merge request !14141
| -rw-r--r-- | app/models/application_setting.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/import-sources-fix.yml | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 3568e72e463..aede9b5f9da 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -247,7 +247,7 @@ class ApplicationSetting < ActiveRecord::Base housekeeping_full_repack_period: 50, housekeeping_gc_period: 200, housekeeping_incremental_repack_period: 10, - import_sources: Gitlab::ImportSources.values, + import_sources: Settings.gitlab['import_sources'], koding_enabled: false, koding_url: nil, max_artifacts_size: Settings.artifacts['max_size'], diff --git a/changelogs/unreleased/import-sources-fix.yml b/changelogs/unreleased/import-sources-fix.yml new file mode 100644 index 00000000000..03e23bc617c --- /dev/null +++ b/changelogs/unreleased/import-sources-fix.yml @@ -0,0 +1,5 @@ +--- +title: Read import sources from setting at first initialization +merge_request: 14141 +author: Visay Keo +type: fixed diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 7c1ca05a57b..8a560d84f1f 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -269,7 +269,7 @@ Settings.gitlab.default_projects_features['builds'] = true if Settin Settings.gitlab.default_projects_features['container_registry'] = true if Settings.gitlab.default_projects_features['container_registry'].nil? Settings.gitlab.default_projects_features['visibility_level'] = Settings.__send__(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE) Settings.gitlab['domain_whitelist'] ||= [] -Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab google_code fogbugz git gitlab_project gitea] +Settings.gitlab['import_sources'] ||= Gitlab::ImportSources.values Settings.gitlab['trusted_proxies'] ||= [] Settings.gitlab['no_todos_messages'] ||= YAML.load_file(Rails.root.join('config', 'no_todos_messages.yml')) Settings.gitlab['usage_ping_enabled'] = true if Settings.gitlab['usage_ping_enabled'].nil? |