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, master has been updated
via c371ee7e70804534ab09c94c47f1e8d890913c8b (commit)
via 2b339124e887df2e6f44efdc48a393932528bfe8 (commit)
from 014c1f99be90d492f8a3fccd9b2a060c0045b198 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c371ee7e70804534ab09c94c47f1e8d890913c8b
commit c371ee7e70804534ab09c94c47f1e8d890913c8b
Author: Franck Villaume <[email protected]>
Date: Mon Mar 28 12:09:11 2016 +0200
scmgit plugin: remove duplicate code
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 99a10f0..5660097 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -105,7 +105,6 @@ control over it to the project's administrator.");
$clone_commands = array();
foreach ($repo_list as $repo_name) {
if (forge_get_config('use_smarthttp', 'scmgit')) {
- $protocol = forge_get_config('use_ssl',
'scmgit')? 'https' : 'http';
$clone_commands[] = 'git clone
'.$protocol.'://'.forge_get_config('scm_host').'/anonscm/git/'.$project->getUnixName().'/'.$repo_name.'.git';
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2b339124e887df2e6f44efdc48a393932528bfe8
commit 2b339124e887df2e6f44efdc48a393932528bfe8
Author: Franck Villaume <[email protected]>
Date: Sat Mar 26 14:29:52 2016 +0100
scmsvn plugin: use use_ssl option to build the location
diff --git a/src/plugins/scmsvn/www/redirect-to-itk.php
b/src/plugins/scmsvn/www/redirect-to-itk.php
index a224270..a63285f 100644
--- a/src/plugins/scmsvn/www/redirect-to-itk.php
+++ b/src/plugins/scmsvn/www/redirect-to-itk.php
@@ -3,6 +3,7 @@
* Redirect authenticated URL to new ITK scheme
*
* Copyright 2015 Inria (Sylvain Beucler)
+ * Copyright 2016, Franck Villaume - TrivialDev
*
* This file is part of FusionForge.
*
@@ -42,9 +43,9 @@ if (empty($auth)) {
}
if ($_SERVER['PHP_AUTH_USER'] == forge_get_config('anonsvn_login', 'scmsvn')) {
- header('Location: https://' . forge_get_config('scm_host') . '/anonscm/'
+ header('Location: http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' :
'').'://' . forge_get_config('scm_host') . '/anonscm/'
. $_SERVER['REQUEST_URI'], true, 301);
} else {
- header('Location: https://' . forge_get_config('scm_host') . '/authscm/'
+ header('Location: http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's'
: '').'://' . forge_get_config('scm_host') . '/authscm/'
. $_SERVER['PHP_AUTH_USER'] . $_SERVER['REQUEST_URI'], true, 301);
-}
\ No newline at end of file
+}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmgit/common/GitPlugin.class.php | 1 -
src/plugins/scmsvn/www/redirect-to-itk.php | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
