diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-22 17:44:59 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-22 17:44:59 +0200 |
| commit | acf297955a5546161ac5e52589ba4740f234a0ae (patch) | |
| tree | e52ac7029d34478af08b7d6627dc348f1f2e60cd /lib | |
| parent | b18bd9c85f0d925aaa6ecf531673958bd97082fc (diff) | |
| download | gitlab-ce-acf297955a5546161ac5e52589ba4740f234a0ae.tar.gz | |
gitlab import UI - icon, file selector, etc... Also updated font-awesome and modified import source settings.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_sources.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index f44d1b3a44e..688e780c13d 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -29,7 +29,7 @@ module Gitlab default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'], default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'], restricted_signup_domains: Settings.gitlab['restricted_signup_domains'], - import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'], + import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git', 'gitlab_project'], shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'], max_artifacts_size: Settings.artifacts['max_size'], require_two_factor_authentication: false, diff --git a/lib/gitlab/import_sources.rb b/lib/gitlab/import_sources.rb index ccfdfbe73e8..2b5658a8b64 100644 --- a/lib/gitlab/import_sources.rb +++ b/lib/gitlab/import_sources.rb @@ -21,6 +21,7 @@ module Gitlab 'Google Code' => 'google_code', 'FogBugz' => 'fogbugz', 'Any repo by URL' => 'git', + 'GitLab project' => 'gitlab_project' } end |