| 1 |
commit: 1c0210ce4a65f4217992059b83a5ad781eeb9b55 |
| 2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 15:44:52 2011 +0000 |
| 4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 15:44:52 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1c0210ce |
| 7 |
|
| 8 |
Merge branch 't/misc' |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
src/gitolite.pm |
| 12 |
|
| 13 |
|
| 14 |
README.mkd | 62 +-- |
| 15 |
contrib/adc/README.mkd | 63 ++ |
| 16 |
contrib/adc/adc.common-functions | 6 +- |
| 17 |
contrib/adc/delete-branch | 84 +++ |
| 18 |
contrib/adc/help | 2 +- |
| 19 |
.../{repo-deletion.README => repo-deletion.mkd} | 9 +- |
| 20 |
contrib/adc/sskm | 275 ++++++++ |
| 21 |
contrib/adc/sskm.mkd | 288 ++++++++ |
| 22 |
contrib/adc/su-getperms | 33 + |
| 23 |
contrib/adc/su-setperms | 1 + |
| 24 |
doc/1-INSTALL.mkd | 552 +++++++++------- |
| 25 |
doc/2-admin.mkd | 11 +- |
| 26 |
doc/3-faq-tips-etc.mkd | 41 +- |
| 27 |
doc/CHANGELOG | 19 + |
| 28 |
doc/admin-defined-commands.mkd | 7 +- |
| 29 |
doc/authentication-vs-authorisation.mkd | 104 +++ |
| 30 |
doc/developer-notes.mkd | 2 +- |
| 31 |
doc/gitolite-and-ssh.mkd | 11 +- |
| 32 |
doc/gitolite-gitweb-http-backend.mkd | 303 ++++++++ |
| 33 |
doc/gitolite-without-ssh.mkd | 75 -- |
| 34 |
doc/gitolite.conf.mkd | 4 + |
| 35 |
doc/gitolite.rc.mkd | 20 +- |
| 36 |
doc/hook-propagation.mkd | 4 +- |
| 37 |
doc/http-backend.mkd | 8 +- |
| 38 |
doc/migrate.mkd | 86 ++- |
| 39 |
doc/mirroring.mkd | 2 +- |
| 40 |
doc/mob-branches.mkd | 8 +- |
| 41 |
doc/monkeysphere.mkd | 2 +- |
| 42 |
doc/report-output.mkd | 6 +- |
| 43 |
doc/ssh-troubleshooting.mkd | 725 ++++++++++--------- |
| 44 |
doc/who-uses-it.mkd | 2 +- |
| 45 |
doc/wildcard-repositories.mkd | 5 +- |
| 46 |
hooks/common/update | 4 +- |
| 47 |
hooks/gitolite-admin/post-update | 4 +- |
| 48 |
src/gitolite.pm | 30 +- |
| 49 |
src/gitolite_rc.pm | 2 +- |
| 50 |
src/gl-admin-push | 50 ++ |
| 51 |
src/gl-compile-conf | 3 +- |
| 52 |
src/gl-dont-panic | 113 --- |
| 53 |
src/gl-easy-install | 2 + |
| 54 |
src/gl-install | 4 +- |
| 55 |
src/gl-setup | 2 + |
| 56 |
src/gl-system-install | 35 +- |
| 57 |
src/sshkeys-lint | 6 +- |
| 58 |
t/README.mkd | 16 +- |
| 59 |
t/install-gitolite | 23 +- |
| 60 |
t/keys/config | 5 +- |
| 61 |
t/rollback.server | 2 +- |
| 62 |
t/t67-hub | 4 +- |
| 63 |
49 files changed, 2191 insertions(+), 934 deletions(-) |
| 64 |
|
| 65 |
diff --cc src/gitolite_rc.pm |
| 66 |
index a1ca9bc,45b99a2..bc57008 |
| 67 |
--- a/src/gitolite_rc.pm |
| 68 |
+++ b/src/gitolite_rc.pm |
| 69 |
@@@ -22,11 -22,9 +22,11 @@@ use Exporter 'import' |
| 70 |
$GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO |
| 71 |
$GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS |
| 72 |
$GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE |
| 73 |
- $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO |
| 74 |
+ $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO $AUTH_OPTIONS |
| 75 |
|
| 76 |
$GL_HTTP_ANON_USER |
| 77 |
+ |
| 78 |
+ @GL_METADATA @GL_METADATA_REQUIRED |
| 79 |
); |
| 80 |
|
| 81 |
# ------------------------------------------------------------------------------ |
Archives