Read import sources from setting at first initialization
This commit is contained in:
parent
5d952f756b
commit
ba6c309f4a
3 changed files with 7 additions and 2 deletions
|
@ -247,7 +247,7 @@ class ApplicationSetting < ActiveRecord::Base
|
||||||
housekeeping_full_repack_period: 50,
|
housekeeping_full_repack_period: 50,
|
||||||
housekeeping_gc_period: 200,
|
housekeeping_gc_period: 200,
|
||||||
housekeeping_incremental_repack_period: 10,
|
housekeeping_incremental_repack_period: 10,
|
||||||
import_sources: Gitlab::ImportSources.values,
|
import_sources: Settings.gitlab['import_sources'],
|
||||||
koding_enabled: false,
|
koding_enabled: false,
|
||||||
koding_url: nil,
|
koding_url: nil,
|
||||||
max_artifacts_size: Settings.artifacts['max_size'],
|
max_artifacts_size: Settings.artifacts['max_size'],
|
||||||
|
|
5
changelogs/unreleased/import-sources-fix.yml
Normal file
5
changelogs/unreleased/import-sources-fix.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Read import sources from setting at first initialization
|
||||||
|
merge_request: 14141
|
||||||
|
author: Visay Keo
|
||||||
|
type: fixed
|
|
@ -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['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.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['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['trusted_proxies'] ||= []
|
||||||
Settings.gitlab['no_todos_messages'] ||= YAML.load_file(Rails.root.join('config', 'no_todos_messages.yml'))
|
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?
|
Settings.gitlab['usage_ping_enabled'] = true if Settings.gitlab['usage_ping_enabled'].nil?
|
||||||
|
|
Loading…
Reference in a new issue