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, 6.1 has been updated
via ff9ae39a46a34b43e97d6419641e26800dda29cd (commit)
via 0a075dd4dcd66c603eb69db60f105f168a48a1af (commit)
from ed7f4778a4a28b114329a9b04437738e4127208f (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=ff9ae39a46a34b43e97d6419641e26800dda29cd
commit ff9ae39a46a34b43e97d6419641e26800dda29cd
Merge: 0a075dd ed7f477
Author: Franck Villaume <[email protected]>
Date: Tue Feb 27 15:27:19 2018 +0000
Merge branch '6.1' of
git+ssh://scm.fusionforge.org/scmrepos/git/fusionforge/fusionforge into 6.1
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0a075dd4dcd66c603eb69db60f105f168a48a1af
commit 0a075dd4dcd66c603eb69db60f105f168a48a1af
Author: Franck Villaume <[email protected]>
Date: Tue Feb 27 15:27:06 2018 +0000
scmhg: fix PHP error, fix second repo deletion
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php
b/src/plugins/scmhg/common/HgPlugin.class.php
index 7d2f6a2..0838a15 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -431,7 +431,7 @@ Offer DAV or SSH access.");
$push = "";
$read = ""; /*pull,clone*/
- $path = forge_get_config('repos_path',
'scmhg').'/'.$project->getUnixName().'/'.$project->getUnixName.'/.hg';
+ $path = forge_get_config('repos_path',
'scmhg').'/'.$project->getUnixName().'/'.$project->getUnixName().'/.hg';
$prevp = false;
$prevr = false;
$users = $project->getMembers();
@@ -913,6 +913,7 @@ Offer DAV or SSH access.");
$deleteForm .= html_e('input', array('type' =>
'hidden', 'name' => 'group_id', 'value' => $params['group_id']));
$deleteForm .= html_e('input', array('type' =>
'hidden', 'name' => 'delete_repository', 'value' => 1));
$deleteForm .= html_e('input', array('type' =>
'hidden', 'name' => 'repo_name', 'value' => $repo['repo_name']));
+ $deleteForm .=
$HTML->html_input('scm_plugin_id', '', '', 'hidden', $this->getID());
$deleteForm .= html_e('input', array('type' =>
'submit', 'name' => 'submit', 'value' => _('Delete')));
$deleteForm .= $HTML->closeForm();
$cells[][] = $deleteForm;
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmhg/common/HgPlugin.class.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
