[Fusionforge-commits] FusionForge branch master updated. 1183b2271720efadf28d4c18c95b3036797d69d3

[Roland Mas]

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  1183b2271720efadf28d4c18c95b3036797d69d3 (commit)
       via  c20f192808d124140d4c3b0722730ba391f2256d (commit)
       via  dd9843eafdfd66db26c1c42422d4d0e14becc416 (commit)
       via  9343478685456ca4c8d0c74c6cd94c3688f5043a (commit)
       via  d734b6d6a9d1874d09389313702b55e8e61d801e (commit)
      from  d0426be36910cdca22a579bf37ee2c89c1eaa477 (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 1183b2271720efadf28d4c18c95b3036797d69d3
Merge: c20f192 dd9843e
Author: Roland Mas <lolando at debian.org>
Date:   Fri Oct 25 15:36:02 2013 +0200

    Merged from 5.2

diff --cc src/plugins/contribtracker/packaging/install/plugin-contribtracker
index 5fc7319,538d858..49c1ca9
--- a/src/plugins/contribtracker/packaging/install/plugin-contribtracker
+++ b/src/plugins/contribtracker/packaging/install/plugin-contribtracker
@@@ -1,4 -1,5 +1,5 @@@
 -plugins/contribtracker/bin/* usr/share/@OLDPACKAGE@/plugins/contribtracker/bin/
 -plugins/contribtracker/common/* usr/share/@OLDPACKAGE@/plugins/contribtracker/common/
 -plugins/contribtracker/db/* usr/share/@OLDPACKAGE@/plugins/contribtracker/db/
 -plugins/contribtracker/etc/*.ini 	   etc/@PACKAGE@/config.ini.d/
 -plugins/contribtracker/www/* usr/share/@OLDPACKAGE@/plugins/contribtracker/www/
 +plugins/contribtracker/bin/* @PLUGIN_PATH@/contribtracker/bin/
 +plugins/contribtracker/common/* @PLUGIN_PATH@/contribtracker/common/
 +plugins/contribtracker/db/* @PLUGIN_PATH@/contribtracker/db/
++plugins/contribtracker/etc/*.ini @CONFIG_PATH@/config.ini.d/
 +plugins/contribtracker/www/* @PLUGIN_PATH@/contribtracker/www/

commit c20f192808d124140d4c3b0722730ba391f2256d
Merge: d0426be 9343478
Author: Roland Mas <lolando at debian.org>
Date:   Fri Oct 25 15:33:23 2013 +0200

    Merged from 5.2

diff --cc src/plugins/scmhook/common/scmhookPlugin.class.php
index cefdd5e,0787e12..168bccf
--- a/src/plugins/scmhook/common/scmhookPlugin.class.php
+++ b/src/plugins/scmhook/common/scmhookPlugin.class.php
@@@ -126,7 -124,8 +126,8 @@@ class scmhookPlugin extends Plugin 
  		return true;
  	}
  
 -	function displayScmHook($group_id) {
 +	function displayScmHook($group_id, $scm) {
+ 		global $HTML;
  		use_javascript('/js/sortable.js');
  		echo $HTML->getJavascripts();
  		$hooksAvailable = $this->getAvailableHooks($group_id);

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

Summary of changes:
 src/plugins/contribtracker/packaging/install/plugin-contribtracker |    1 +
 src/plugins/scmhook/common/scmhookPlugin.class.php                 |    1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
FusionForge