diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-11-30 16:11:40 +0100 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-12-01 10:12:07 +0100 |
| commit | 23523a9122a11a6aa6c12f94bc09a7adc4b30a38 (patch) | |
| tree | 12f9ee1da93aa44242517f4482981e075518921b /sonar-core | |
| parent | a2af122ecc5918e13cd490d40bb7f64acff53990 (diff) | |
| download | sonarqube-23523a9122a11a6aa6c12f94bc09a7adc4b30a38.tar.gz sonarqube-23523a9122a11a6aa6c12f94bc09a7adc4b30a38.zip | |
Revert "SONAR-8151 remove property category Organizations from UI for 6.2"
This reverts commit ba3c13b388823a69e5821aa5d3006e3b1cc01923.
Diffstat (limited to 'sonar-core')
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java | 21 | ||||
| -rw-r--r-- | sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java | 2 |
2 files changed, 10 insertions, 13 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 03a10b6e8c8..32e595df780 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 @@ -292,18 +292,15 @@ public class CorePropertyDefinitions { .category(CoreProperties.CATEGORY_EXCLUSIONS) .subCategory(CoreProperties.SUBCATEGORY_DUPLICATIONS_EXCLUSIONS) .multiValues(true) - .build() -// FIXME remove organization property category from UI for release 6.2 -// , -// -// // ORGANIZATIONS -// PropertyDefinition.builder(ORGANIZATIONS_ANYONE_CAN_CREATE) -// .name("Allow any authenticated user to create organizations") -// .defaultValue(Boolean.toString(false)) -// .category(CATEGORY_ORGANIZATIONS) -// .type(PropertyType.BOOLEAN) -// .build() - )); + .build(), + + // ORGANIZATIONS + PropertyDefinition.builder(ORGANIZATIONS_ANYONE_CAN_CREATE) + .name("Allow any authenticated user to create organizations") + .defaultValue(Boolean.toString(false)) + .category(CATEGORY_ORGANIZATIONS) + .type(PropertyType.BOOLEAN) + .build())); return defs; } } diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java index bf9d2501497..470cc2f2ed8 100644 --- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java @@ -35,7 +35,7 @@ public class CorePropertyDefinitionsTest { @Test public void all() { List<PropertyDefinition> defs = CorePropertyDefinitions.all(); - assertThat(defs).hasSize(64); + assertThat(defs).hasSize(65); } @Test |