X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=project.config;h=02a3a7ad7f21aae56c88c544dfbfb0ee4c05c7ca;hb=e4af9376c6d0cf800c4d622169252dab9ad83e99;hp=983100d35dd3a3705a095c4afa1807c74847be61;hpb=ad76c37b0c656241b7f5c62f06df011301f6e4f9;p=All-Projects.git

diff --git a/project.config b/project.config
index 983100d..02a3a7a 100644
--- a/project.config
+++ b/project.config
@@ -5,8 +5,11 @@
 	requireSignedOffBy = true
 	requireChangeId = true
 	createNewChangeForAllNotInTarget = false
+	rejectImplicitMerges = false
 [submit]
 	mergeContent = true
+	action = rebase if necessary
+	matchAuthorToCommitterDate = false
 [capability]
 	administrateServer = group Administrators
 	administrateServer = group ldap/OSM_Admin
@@ -19,7 +22,6 @@
 	forgeAuthor = group ldap/OSM_Admin
 	forgeAuthor = group ldap/OSM_Leader
 	forgeCommitter = group ldap/OSM_Admin
-	forgeCommitter = group ldap/OSM_Leader
 	removeReviewer = group ldap/OSM_Leader
 [access "refs/heads/*"]
 	create = group Administrators
@@ -29,7 +31,6 @@
 	create = group ldap/OSM_TSC
 	push = +force group Administrators
 	push = +force group ldap/OSM_Admin
-	push = +force group ldap/OSM_Leader
 	label-Code-Review = -2..+2 group Administrators
 	label-Code-Review = -2..+2 group Project Owners
 	label-Code-Review = -2..+2 group ldap/OSM_Leader
@@ -54,6 +55,7 @@
 	pushMerge = group ldap/OSM_Admin
 	pushMerge = group ldap/OSM_Leader
 	rebase = group ldap/OSM_Leader
+	exclusiveGroupPermissions = push
 [access "refs/meta/config"]
 	exclusiveGroupPermissions = read
 	read = group Administrators
@@ -73,17 +75,10 @@
 	label-Verified = -1..+1 group Administrators
 	label-Verified = -1..+1 group Project Owners
 	label-Verified = -1..+1 group ldap/OSM_Admin
+	create = group Administrators
+	create = group Project Owners
+	create = group ldap/OSM_Admin
 [access "refs/tags/*"]
-	pushTag = group Administrators
-	pushTag = group Project Owners
-	pushTag = group ldap/OSM_Admin
-	pushTag = group ldap/OSM_Leader
-	pushTag = group ldap/OSM_TSC
-	pushSignedTag = group Administrators
-	pushSignedTag = group Project Owners
-	pushSignedTag = group ldap/OSM_Admin
-	pushSignedTag = group ldap/OSM_Leader
-	pushSignedTag = group ldap/OSM_TSC
 	push = +force group Administrators
 	push = +force group Project Owners
 	push = +force group ldap/OSM_Admin
@@ -95,19 +90,29 @@
 	create = group ldap/OSM_Admin
 	create = group ldap/OSM_Leader
 	create = group ldap/OSM_TSC
+	createTag = group Administrators
+	createTag = group Project Owners
+	createTag = group ldap/OSM_Admin
+	createTag = group ldap/OSM_Leader
+	createTag = group ldap/OSM_TSC
+	createSignedTag = group Administrators
+	createSignedTag = group Project Owners
+	createSignedTag = group ldap/OSM_Admin
+	createSignedTag = group ldap/OSM_Leader
+	createSignedTag = group ldap/OSM_TSC
 [label "Code-Review"]
 	function = MaxWithBlock
 	defaultValue = 0
 	copyMinScore = true
 	value = -2 This shall not be merged
 	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, but someone else must approve
 	value = +2 Looks good to me, approved
 [label "Verified"]
 	function = MaxWithBlock
 	value = -1 Fails
-	value =  0 No score
+	value = " 0 No score"
 	value = +1 Verified
 	defaultValue = 0
 [access "refs/for/refs/*"]
@@ -120,7 +125,13 @@
 	forgeAuthor = group ldap/OSM_Admin
 	forgeCommitter = group ldap/OSM_Admin
 	rebase = group ldap/OSM_Leader
-[access "refs/heads/master"]
-	push = deny group ldap/OSM_Contributor
+[access "refs/for/*"]
+	addPatchSet = group Registered Users
+[change]
+	privateByDefault = false
+	workInProgressByDefault = false
+[reviewer]
+	enableByEmail = false
 [plugin "its-bugzilla"]
+	branch = refs/heads/*
 	enabled = true