aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacek <jacek.poreda@sonarsource.com>2020-07-27 15:29:16 +0200
committersonartech <sonartech@sonarsource.com>2020-08-17 20:06:22 +0000
commited7d37d968be8361a56eae4a0a1b49a19a44d8db (patch)
tree9944e3bcef04114f4991fd641a61ce6f0efb7a25
parentc9460063e843eef0c94a442c3326c4d24d1a921b (diff)
downloadsonarqube-ed7d37d968be8361a56eae4a0a1b49a19a44d8db.tar.gz
sonarqube-ed7d37d968be8361a56eae4a0a1b49a19a44d8db.zip
SONAR-13633 Match existing gitlab projects with gitlab search repos results
-rw-r--r--server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java5
-rw-r--r--sonar-ws/src/main/protobuf/ws-alm_integrations.proto1
2 files changed, 6 insertions, 0 deletions
diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java
index d4fbef37f8e..23413febddf 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/almsettings/AlmSettingsDbTester.java
@@ -77,6 +77,11 @@ public class AlmSettingsDbTester {
}
@SafeVarargs
+ public final ProjectAlmSettingDto insertGitlabProjectAlmSetting(AlmSettingDto gitlabAlmSetting, ProjectDto project, Consumer<ProjectAlmSettingDto>... populators) {
+ return insertProjectAlmSetting(newGitlabProjectAlmSettingDto(gitlabAlmSetting, project), populators);
+ }
+
+ @SafeVarargs
public final ProjectAlmSettingDto insertBitbucketProjectAlmSetting(AlmSettingDto bitbucketAlmSetting, ProjectDto project, Consumer<ProjectAlmSettingDto>... populators) {
return insertProjectAlmSetting(newBitbucketProjectAlmSettingDto(bitbucketAlmSetting, project), populators);
}
diff --git a/sonar-ws/src/main/protobuf/ws-alm_integrations.proto b/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
index 44604c69b4f..97417220fb5 100644
--- a/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
+++ b/sonar-ws/src/main/protobuf/ws-alm_integrations.proto
@@ -94,4 +94,5 @@ message GitlabRepository {
optional string pathSlug = 5;
optional string url = 6;
optional string sqProjectKey = 7;
+ optional string sqProjectName = 8;
}