diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-12 11:50:27 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-12 11:50:27 +0000 |
| commit | 2f83794d2b727594676e25e85ada53e33cf5246a (patch) | |
| tree | c42d926778e82bd66783f43f2020b656bda80d61 /lib/api | |
| parent | 94627fd7e3b4010e12f7a0698494b2c36c4f76ef (diff) | |
| parent | 751e1786dfe727c11ddae28e77be6eb88fbfbbf9 (diff) | |
| download | gitlab-ce-2f83794d2b727594676e25e85ada53e33cf5246a.tar.gz | |
Merge branch 'dz-manifest-import' into 'master'
Add manifest import
See merge request gitlab-org/gitlab-ce!20304
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 02ef89f997f..1ca7d23203b 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -25,7 +25,7 @@ module API optional :default_snippet_visibility, type: String, values: Gitlab::VisibilityLevel.string_values, desc: 'The default snippet visibility' optional :default_group_visibility, type: String, values: Gitlab::VisibilityLevel.string_values, desc: 'The default group visibility' optional :restricted_visibility_levels, type: Array[String], desc: 'Selected levels cannot be used by non-admin users for groups, projects or snippets. If the public level is restricted, user profiles are only visible to logged in users.' - optional :import_sources, type: Array[String], values: %w[github bitbucket gitlab google_code fogbugz git gitlab_project], + optional :import_sources, type: Array[String], values: %w[github bitbucket gitlab google_code fogbugz git gitlab_project manifest], desc: 'Enabled sources for code import during project creation. OmniAuth must be configured for GitHub, Bitbucket, and GitLab.com' optional :disabled_oauth_sign_in_sources, type: Array[String], desc: 'Disable certain OAuth sign-in sources' optional :enabled_git_access_protocol, type: String, values: %w[ssh http nil], desc: 'Allow only the selected protocols to be used for Git access.' |