From: Jacek <jacek.poreda@sonarsource.com>
Date: Mon, 27 Jul 2020 13:29:16 +0000 (+0200)
Subject: SONAR-13633 Match existing gitlab projects with gitlab search repos results
X-Git-Tag: 8.5.0.37579~144
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ed7d37d968be8361a56eae4a0a1b49a19a44d8db;p=sonarqube.git

SONAR-13633 Match existing gitlab projects with gitlab search repos results
---

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
@@ -76,6 +76,11 @@ public class AlmSettingsDbTester {
     return insertProjectAlmSetting(newGitlabProjectAlmSettingDto(gitlabAlmSetting, project));
   }
 
+  @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;
 }