Tweak submit-requirement.

Signed-off-by: Sandrine Afsa <sandrine.afsa@arm.com>
diff --git a/project.config b/project.config
index 01e54d7..317ea8f 100644
--- a/project.config
+++ b/project.config
@@ -59,50 +59,33 @@
 ################################################################################
 [label "Code-Owner-Review"]
 	value = -1 I would prefer this is not merged as is
-	value = 0 No score
+	value =  0 No score
 	value = +1 Looks good to me
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 
-[submit-requirement "Code-Owner-Review"]
-	description = A maximum vote from a non-uploader is required for this \
-	              label. A minimum vote is blocking.
-	submittableIf = label:Code-Owner-Review=MAX,user=non_uploader AND -label:Code-Review=MIN
-	canOverrideInChildProjects = true
-
-
 [label "Unsafe-Review"]
 	value = -1 I would prefer this is not merged as is
-	value = 0 No score
+	value =  0 No score
 	value = +1 Looks good to me
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 
-# TODO: Define a "submit requirement" for the Unsafe-Review label once we've
-# setup the CI to auto-vote +1 on this label for purely safe patches.
-
-
 [label "Maintainer-Review"]
 	value = -1 I would prefer this is not merged as is
-	value = 0 No score
+	value =  0 No score
 	value = +1 Looks good to me
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 
-[submit-requirement "Maintainer-Review"]
-	description = A maximum vote from a non-uploader is required for this \
-	              label. A minimum vote is blocking.
-	submittableIf = label:Maintainer-Review=MAX,user=non_uploader AND -label:Maintainer-Review=MIN
-	canOverrideInChildProjects = true
-
-
 [label "Verified"]
 	value = -1 Fails
-	value = 0 No score
+	value =  0 No score
 	value = +1 Verified
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 
-[submit-requirement "Verified"]
-	submittableIf = label:Verified=MAX AND -label:Verified=MIN
+[submit-requirement "Submittable"]
+	applicableIf = -branch:refs/meta/config
+	submittableIf = label:Code-Owner-Review=MAX,user=non_uploader AND -label:Code-Owner-Review=MIN AND label:Unsafe-Review=MAX AND -label:Unsafe-Review=MIN AND label:Maintainer-Review=MAX,user=non_uploader AND -label:Maintainer-Review=MIN AND label:Verified=MAX AND -label:Verified=MIN
 	canOverrideInChildProjects = true