diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-21 16:04:07 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-21 16:04:07 +0000 |
| commit | 1177322185592ff8eff56f43701fbb3b44d10c83 (patch) | |
| tree | 13b442d46bb912095409eb65e730dd61c14e18f0 | |
| parent | 5ecae728e3ca6e64b29edd485640771adc683fa9 (diff) | |
| parent | 8888dfaa8f862750aaf4565a41f7941cdf3f1a29 (diff) | |
| download | gitlab-ce-1177322185592ff8eff56f43701fbb3b44d10c83.tar.gz | |
Merge branch 'fix/import-sources' into 'master'
Add missing import source
I realised https://gitlab.com/projects/new is missing the `gitlab export` option, while this worked fine in GDK it seems that something was missing here.
This _should_ fix it unless I'm missing any other `import_sources` (did a grep and couldn't find it anywhere else though).
See merge request !4825
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 09ffc319065..c6dc1e4ab38 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -215,7 +215,7 @@ Settings.gitlab.default_projects_features['container_registry'] = true if Settin 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['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive') if Settings.gitlab['repository_downloads_path'].nil? Settings.gitlab['restricted_signup_domains'] ||= [] -Settings.gitlab['import_sources'] ||= ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'] +Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project] Settings.gitlab['trusted_proxies'] ||= [] |