diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2019-09-17 12:21:53 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-09-23 20:21:07 +0200 |
| commit | 056302d0d534a30a8a7d905602455b0ba0f900a2 (patch) | |
| tree | 1e755215fb861b215e97e724239c22036cccc639 /server/sonar-webserver | |
| parent | 26a7d44c9cce85b62e6d3f2043aa3eddc500a54e (diff) | |
| download | sonarqube-056302d0d534a30a8a7d905602455b0ba0f900a2.tar.gz sonarqube-056302d0d534a30a8a7d905602455b0ba0f900a2.zip | |
SONAR-12460 Support GitLab Authentication
Diffstat (limited to 'server/sonar-webserver')
| -rw-r--r-- | server/sonar-webserver/build.gradle | 1 | ||||
| -rw-r--r-- | server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle index 4fc1039102f..87b08f8c225 100644 --- a/server/sonar-webserver/build.gradle +++ b/server/sonar-webserver/build.gradle @@ -12,6 +12,7 @@ dependencies { compile 'com.google.guava:guava' compile 'org.apache.tomcat.embed:tomcat-embed-core' compile project(':sonar-core') + compile project(':server:sonar-auth-gitlab') compile project(':server:sonar-ce-task-projectanalysis') compile project(':server:sonar-process') compile project(':server:sonar-webserver-core') diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index c00cf3852c9..da9712f4f48 100644 --- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -28,6 +28,7 @@ import org.sonar.api.resources.ResourceTypes; import org.sonar.api.rules.AnnotationRuleParser; import org.sonar.api.rules.XMLRuleParser; import org.sonar.api.server.rule.RulesDefinitionXmlLoader; +import org.sonar.auth.gitlab.GitLabModule; import org.sonar.ce.task.projectanalysis.notification.ReportAnalysisFailureNotificationModule; import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor; import org.sonar.core.component.DefaultResourceTypes; @@ -349,6 +350,7 @@ public class PlatformLevel4 extends PlatformLevel { // authentication AuthenticationModule.class, AuthenticationWsModule.class, + GitLabModule.class, // users UserSessionFactoryImpl.class, |