diff options
| author | Jenkins CI <ci@sonarsource.com> | 2016-01-06 12:50:23 +0100 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2016-01-06 12:50:23 +0100 |
| commit | 0429a8b70f7d60755f65602037d1c6fd01011c75 (patch) | |
| tree | 8556eb60c0dcd8ad6f16dcf118dc1cec3fd192b3 /sonar-core | |
| parent | 0fddc5fa4ea33882b60e072eee51f0e1ea585b4c (diff) | |
| parent | 36619d7c9a56bef27d2430b77685e7a4f65abb55 (diff) | |
| download | sonarqube-0429a8b70f7d60755f65602037d1c6fd01011c75.tar.gz sonarqube-0429a8b70f7d60755f65602037d1c6fd01011c75.zip | |
Automatic merge from branch-5.3
* origin/branch-5.3:
SONAR-7093 Allow projects to define their leak period
fix display of date leak period
Diffstat (limited to 'sonar-core')
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java | 1 | ||||
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/l10n/core.properties | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java index d6000bff228..b21d43a3c47 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java +++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java @@ -237,6 +237,7 @@ public class CorePropertyDefinitions { .defaultValue(TIMEMACHINE_DEFAULT_PERIOD_1) .category(CoreProperties.CATEGORY_GENERAL) .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .onQualifiers(Qualifiers.PROJECT, Qualifiers.VIEW) .build(), PropertyDefinition.builder(TIMEMACHINE_PERIOD_PREFIX + 2) diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 86e4eac69e7..fc841d7e677 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -3125,6 +3125,7 @@ overview.period.previous_version_only_date=since previous version overview.period.previous_analysis=since previous analysis overview.period.days=last {0} days overview.period.version=since {0} +overview.period.date=since {0} overview.gate.ERROR=Failed overview.gate.WARN=Warning |