diff options
| -rw-r--r-- | server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java | 1 | ||||
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java index 230515e95c0..9e69d55f2d9 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDto.java @@ -529,7 +529,6 @@ public class ComponentDto { return copy; } - // TODO Use it in branch plugin public static String generateBranchKey(String componentKey, String branch) { return format("%s%s%s", componentKey, BRANCH_KEY_SEPARATOR, branch); } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java index db04d12b285..69117521b1d 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/EmailSettings.java @@ -147,14 +147,14 @@ public class EmailSettings { .build(), PropertyDefinition.builder(FROM) .name("From address") - .description("Emails will come from this address. For example - \"noreply@sonarsource.com\". Note that server may ignore this setting.") + .description("Emails will come from this address. For example - \"noreply@sonarsource.com\". Note that the mail server may ignore this setting.") .defaultValue(FROM_DEFAULT) .category(CATEGORY_GENERAL) .subCategory(SUBCATEGORY_EMAIL) .build(), PropertyDefinition.builder(FROM_NAME) .name("From name") - .description("Emails will come from this address name. For example - \"SonarQube\". Note that server may ignore this setting.") + .description("Emails will come from this address name. For example - \"SonarQube\". Note that the mail server may ignore this setting.") .defaultValue(FROM_NAME_DEFAULT) .category(CATEGORY_GENERAL) .subCategory(SUBCATEGORY_EMAIL) |