diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-26 12:09:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-26 12:09:48 +0000 |
| commit | 142890d5bbefa7b1e1b30f263f9ad67d9d496d29 (patch) | |
| tree | 2c4de4059aba586f3204f983f17757dbf1643b6c /lib/api/settings.rb | |
| parent | bbede1e22c4dd615042a3e9c0d7e24afc83ca377 (diff) | |
| download | gitlab-ce-142890d5bbefa7b1e1b30f263f9ad67d9d496d29.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/settings.rb')
| -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 b95856d99d1..105b8e6971d 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -88,7 +88,7 @@ module API end optional :html_emails_enabled, type: Boolean, desc: 'By default GitLab sends emails in HTML and plain text formats so mail clients can choose what format to use. Disable this option if you only want to send emails in plain text format.' optional :import_sources, type: Array[String], coerce_with: Validations::Types::CommaSeparatedToArray.coerce, - values: %w[github bitbucket bitbucket_server gitlab google_code fogbugz git gitlab_project gitea manifest phabricator], + values: %w[github bitbucket bitbucket_server gitlab fogbugz git gitlab_project gitea manifest phabricator], desc: 'Enabled sources for code import during project creation. OmniAuth must be configured for GitHub, Bitbucket, and GitLab.com' optional :max_artifacts_size, type: Integer, desc: "Set the maximum file size for each job's artifacts" optional :max_attachment_size, type: Integer, desc: 'Maximum attachment size in MB' |