BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 13bb9ed7 by Robert Speicher
Options

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
parents d01cbe0c e672c012
Showing with 1 addition and 1 deletion
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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment