summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-05-29 11:50:20 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-05-29 11:50:20 +0000
commit4af756e5269ae3975add615ddf286447258cf583 (patch)
treea4a6db606cd7575a8c9eaed1488abc3806585ae6 /lib/api
parenta4c8afdadfebc2d9a7c4d9a870e306bafd1b0998 (diff)
parentd6e3a6b5fb79ae1983daf096bf87fe14d298e6dc (diff)
downloadgitlab-ce-4af756e5269ae3975add615ddf286447258cf583.tar.gz
Merge branch '44602-clarify-update-docs-text-about-restrictions' into 'master'
Resolve "Clarify/Update docs/text about restrictions." See merge request gitlab-org/gitlab-ce!17970
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index e31c332b6e4..d727ad59367 100644
--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -24,7 +24,7 @@ module API
optional :default_project_visibility, type: String, values: Gitlab::VisibilityLevel.string_values, desc: 'The default project visibility'
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 projects or snippets. If the public level is restricted, user profiles are only visible to logged in users.'
+ 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],
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'