diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-15 11:20:11 -0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-15 11:20:11 -0300 |
| commit | 35c9a75eff464ff7bb0e58c67488a6fa1bdebaaa (patch) | |
| tree | b78097fd10cad31f45b8b6613d45960f2872802c /lib/api/settings.rb | |
| parent | 0112d13314e1aea350c7dacc02c0f1c527566809 (diff) | |
| parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
| download | gitlab-ce-docs-topic-permissions.tar.gz | |
fix conflictdocs-topic-permissions
Diffstat (limited to 'lib/api/settings.rb')
| -rw-r--r-- | lib/api/settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index d55a61fa638..667ba468ce6 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -29,6 +29,7 @@ module API 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.' + optional :project_export_enabled, type: Boolean, desc: 'Enable project export' optional :gravatar_enabled, type: Boolean, desc: 'Flag indicating if the Gravatar service is enabled' optional :default_projects_limit, type: Integer, desc: 'The maximum number of personal projects' optional :max_attachment_size, type: Integer, desc: 'Maximum attachment size in MB' |