[Fusionforge-commits] FusionForge branch master updated. d58e5aafe7b1fd0a9604e674125422aafb26df56

Roland Mas lolando at fusionforge.org
Thu May 15 15:45:37 CEST 2014


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  d58e5aafe7b1fd0a9604e674125422aafb26df56 (commit)
       via  e6d8521ae6720230398247b7468b19f2b0219e15 (commit)
       via  6cefbe804d196bbe19768b904654c6847903973f (commit)
       via  5b9fb3d609fac942b5decac1b3a1c685bb64c617 (commit)
       via  a051929d251dd3c968e2e9247cdd33a451538cab (commit)
       via  3eec0dfb87b5f49fa8fb740ecbd4f8085647522a (commit)
      from  cd4f60ce5f17c5ad40314931f6be36be3feb65bc (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 d58e5aafe7b1fd0a9604e674125422aafb26df56
Merge: cd4f60c e6d8521
Author: Roland Mas <lolando at debian.org>
Date:   Thu May 15 15:45:32 2014 +0200

    Merge branch 'Branch_5_3'

diff --cc src/www/admin/useredit.php
index d36137b,cc15b2b..5aa92f3
--- a/src/www/admin/useredit.php
+++ b/src/www/admin/useredit.php
@@@ -290,10 -289,10 +289,10 @@@ echo '<h2>'._('Add membership to new pr
  $addToNewProjectsTableTitle = array();
  $addToNewProjectsTableTitle[] = '';
  $addToNewProjectsTableTitle[] = _('Name');
 -$addToNewProjectsTableTitle[] = _('Unix name');
 +$addToNewProjectsTableTitle[] = _('Unix Name');
  $addToNewProjectsTableTitle[] = _('Operations');
  $addToNewProjectsTableTitle[] = _('Select role');
- $fullListProjectsQueryResult = db_query_params('SELECT group_id from groups where status = $1 and is_template = 0', array('A'));
+ $fullListProjectsQueryResult = db_query_params('SELECT group_id from groups where status = $1 and is_template = 0 LIMIT 100', array('A'));
  if ($fullListProjectsQueryResult) {
  	echo $GLOBALS['HTML']->listTableTop($addToNewProjectsTableTitle);
  	while ($projectQueryResult = db_fetch_array($fullListProjectsQueryResult)) {

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

Summary of changes:
 src/common/tracker/Artifact.class.php         |    2 +-
 src/plugins/scmgit/common/GitPlugin.class.php |    4 ++--
 src/www/admin/useredit.php                    |    5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list