From 23523a9122a11a6aa6c12f94bc09a7adc4b30a38 Mon Sep 17 00:00:00 2001 From: Sébastien Lesaint Date: Wed, 30 Nov 2016 16:11:40 +0100 Subject: Revert "SONAR-8151 remove property category Organizations from UI for 6.2" This reverts commit ba3c13b388823a69e5821aa5d3006e3b1cc01923. --- .../sonar/core/config/CorePropertyDefinitions.java | 21 +++++++++------------ .../core/config/CorePropertyDefinitionsTest.java | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'sonar-core') 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 defs = CorePropertyDefinitions.all(); - assertThat(defs).hasSize(64); + assertThat(defs).hasSize(65); } @Test -- cgit v1.2.3