aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>2018-01-09 08:01:11 +0100
committerssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>2018-01-09 08:01:11 +0100
commitd720bc0e079a21951829fa26710f62f42587b7c0 (patch)
treea9c4cb11c8ffaee2903fec1a7b7238bbb5c8a889
parent7c22144cd5226bfccbcff0792c853d2e4de7cd81 (diff)
parent301948519330547d1c1b7a12ad8d7d0ded750d15 (diff)
downloadsonarqube-d720bc0e079a21951829fa26710f62f42587b7c0.tar.gz
sonarqube-d720bc0e079a21951829fa26710f62f42587b7c0.zip
Automatic merge from branch-6.7
* origin/branch-6.7: SONAR-10246 Fix documentation about default group in sso authentication
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties4
1 files changed, 2 insertions, 2 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 1a457273bfb..3dc4e4199cf 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -164,8 +164,8 @@
# Name of the header to get the list of user groups, separated by comma (optional).
# If the sonar.sso.groupsHeader is set, the user will belong to those groups if groups exist in SonarQube.
-# If none of the provided groups exists in SonarQube, the user won't belong to any group.
-# Note that the default group will NOT be automatically added when using SSO, it should be provided in the groups list, if needed.
+# If none of the provided groups exists in SonarQube, the user will only belong to the default group.
+# Note that the default group will always be set.
#sonar.web.sso.groupsHeader=X-Forwarded-Groups
# Interval used to know when to refresh name, email and groups.