[Fusionforge-commits] FusionForge branch feature/browse-private-repositories updated. 3626b9206b46ed5616f4a415400db996d86dc04c

Roland Mas lolando at fusionforge.org
Mon Jan 26 18:03:42 CET 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, feature/browse-private-repositories has been updated
       via  3626b9206b46ed5616f4a415400db996d86dc04c (commit)
       via  6f002ac4113fd7d055cf6854cc7a8d24ef188981 (commit)
       via  f79bd7690a4d0c53188ccf9e81813d8f8c41792c (commit)
      from  6c79fac98ad0f3d00d9fcc390a37840c9b54ee16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3626b9206b46ed5616f4a415400db996d86dc04c
Merge: f79bd76 6f002ac
Author: Roland Mas <lolando at debian.org>
Date:   Mon Jan 26 18:03:37 2015 +0100

    Merge branch 'master' into feature/browse-private-repositories


commit f79bd7690a4d0c53188ccf9e81813d8f8c41792c
Author: Roland Mas <lolando at debian.org>
Date:   Mon Jan 26 17:08:37 2015 +0100

    Reverting "Set an explicit group id"
    Reverting "Actually remove configuration line"
    Reverting "Don't run gitweb under a particular group ID"

diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index ed4aa3e..7b3afea 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -341,7 +341,7 @@ control over it to the project's administrator.");
 				} elseif (session_loggedin()) {
 						$u = user_get_object(user_getid())->getUnixName();
 						$box = $this->getBoxForProject($project);
-						$iframesrc = "$protocol://$box/authscm/$u/gitweb/".$project->getUnixName().'?p='.$project->getUnixName().'/users/'.$user->getUnixName().'.git';
+						$iframesrc = "$protocol://$box/authscm/$u/gitweb/".$project->getUnixName().'/?p='.$project->getUnixName().'/users/'.$user->getUnixName().'.git';
 				}
 				htmlIframe($iframesrc, array('id'=>'scmgit_iframe', 'absolute'=>true));
 			} elseif ($this->browserDisplayable($project)) {
@@ -351,7 +351,7 @@ control over it to the project's administrator.");
 						$u = user_get_object(user_getid())->getUnixName();
 						$protocol = forge_get_config('use_ssl', 'scmgit')? 'https' : 'http';
 						$box = $this->getBoxForProject($project);
-						$iframesrc = "$protocol://$box/authscm/$u/gitweb/".$project->getUnixName().'?p='.$project->getUnixName().'/'.$project->getUnixName().'.git';
+						$iframesrc = "$protocol://$box/authscm/$u/gitweb/".$project->getUnixName().'/?p='.$project->getUnixName().'/'.$project->getUnixName().'.git';
 				}
 				if ($params['commit']) {
 					$iframesrc .= ';a=log;h='.$params['commit'];
diff --git a/src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc b/src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc
index b9537c7..b1ad3c1 100644
--- a/src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc
+++ b/src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc
@@ -23,7 +23,7 @@ ScriptAliasMatch ^/authscm/[^/]+/git/(.*) {core/plugins_path}/scmgit/libexec/git
 </LocationMatch>
 
 ScriptAlias /anonscm/gitweb {core/plugins_path}/scmgit/cgi-bin/gitweb.cgi
-ScriptAliasMatch ^/authscm/[^/]+/gitweb/([^/]+) {core/plugins_path}/scmgit/cgi-bin/gitweb.cgi
+ScriptAliasMatch ^/authscm/[^/]+/gitweb/([^/?]+) {core/plugins_path}/scmgit/cgi-bin/gitweb.cgi
 
 <LocationMatch "^/authscm/[^/]+/gitweb/">
   AuthType Basic
diff --git a/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc b/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
index b655376..00c062c 100644
--- a/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
+++ b/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
@@ -1,4 +1,4 @@
 SetEnvIf Request_URI ^/authscm/([^/]+)/git/ ITKUID=$1
 SetEnvIf Request_URI ^/authscm/([^/]+)/git/([^/]+)/ ITKGID=$2
 SetEnvIf Request_URI ^/authscm/([^/]+)/gitweb/ ITKUID=$1
-SetEnvIf Request_URI ^/authscm/([^/]+)/gitweb/ ITKGID={core/apache_group}
+SetEnvIf Request_URI ^/authscm/([^/]+)/gitweb/([^/?]+)/ ITKGID=$2

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/scmgit/bin/install.sh                               |    2 +-
 src/plugins/scmgit/common/GitPlugin.class.php                   |    4 ++--
 src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc           |    2 +-
 src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list