summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2015-10-04 14:32:04 -0400
committerRob Austein <sra@hactrn.net>2015-10-04 14:32:04 -0400
commit999e89bdadbc3fcdd1270afe3f5f683ebad46465 (patch)
tree0959beb31e39a90ff302270f591384780dad3bc9 /conf
parent6df9dc74b14506cd3439d519d396ac2cc7a2f125 (diff)
Seems "+" permission is required to delete merged branches.
Diffstat (limited to 'conf')
-rw-r--r--conf/gitolite.conf12
1 files changed, 7 insertions, 5 deletions
diff --git a/conf/gitolite.conf b/conf/gitolite.conf
index 01a6860..101f319 100644
--- a/conf/gitolite.conf
+++ b/conf/gitolite.conf
@@ -22,10 +22,12 @@ repo gitolite-admin
# Everything but the gitolite-admin repository is currently set up for
# "wild repositories" (http://sitaramc.github.com/gitolite/wild.html).
#
-# We used to allow R for @all but restrict RW to WRITERS, but at the moment
-# we just allow any authorized user to push to any wild repository.
+# We used to allow R for @all but restrict RW to WRITERS, but at the
+# moment we just allow any authorized user to push to any wild
+# repository. Then we added "+" for any authorized user because it's
+# required to delete old branches. At which point there was no
+# difference between CREATOR privs and everybody else's privs, so we
+# just collapsed them.
repo [a-zA-Z0-9].*
- C = @all
- RW+ = CREATOR
- RW = @all
+ CRW+ = @all