diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-21 16:04:07 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-21 12:06:40 -0400 |
| commit | 42cd3d3d2732cdf521b993798bb149ed799680ec (patch) | |
| tree | b2b4e269faa6b33468910f3292b39d689ea3aedf | |
| parent | ddea2e3f25a661fc27907266db52bb9f3ac4d76b (diff) | |
| download | gitlab-ce-42cd3d3d2732cdf521b993798bb149ed799680ec.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'] ||= [] |