[Fusionforge-commits] FusionForge branch 6.0 updated. 81eaedc57f472c99e406198a23dc447dff3de7a0

Roland Mas lolando at fusionforge.org
Wed Apr 8 15:07:41 CEST 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, 6.0 has been updated
       via  81eaedc57f472c99e406198a23dc447dff3de7a0 (commit)
       via  2bed737a5eee7966c928090e92e51003ef0cd8bd (commit)
      from  96d6f4786472c5f58edb5559ee71baeb12e16cac (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 81eaedc57f472c99e406198a23dc447dff3de7a0
Author: Roland Mas <lolando at debian.org>
Date:   Wed Apr 8 15:06:58 2015 +0200

    Grant tracker administrators submit permissions

diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php
index 1f46b10..eaf2c73 100644
--- a/src/common/include/RBAC.php
+++ b/src/common/include/RBAC.php
@@ -572,7 +572,7 @@ abstract class BaseRole extends Error {
 
 		case 'tracker':
 			if ($this->hasPermission('tracker_admin', artifacttype_get_groupid($reference))) {
-				return 5 | $value ;
+				return 31 | $value ;
 			} elseif (!$this->hasPermission('project_read', artifacttype_get_groupid($reference))) {
 				return 0;
 			}
@@ -580,7 +580,7 @@ abstract class BaseRole extends Error {
 			break ;
 		case 'new_tracker':
 			if ($this->hasPermission('tracker_admin', $reference)) {
-				return 5 | $value ;
+				return 31 | $value ;
 			} elseif (!$this->hasPermission('project_read', $reference)) {
 				return 0;
 			}

commit 2bed737a5eee7966c928090e92e51003ef0cd8bd
Author: Roland Mas <lolando at debian.org>
Date:   Wed Apr 8 14:59:44 2015 +0200

    Reduce timeout for Selenium starting following the previous fix

diff --git a/tests/func/phpunit-selenium.sh b/tests/func/phpunit-selenium.sh
index b53d5ce..182d9a4 100755
--- a/tests/func/phpunit-selenium.sh
+++ b/tests/func/phpunit-selenium.sh
@@ -129,7 +129,7 @@ EOF
 
 echo "Starting Selenium"
 killall -9 java || true
-timeout=300
+timeout=30
 PATH=/usr/lib/iceweasel:/usr/lib64/firefox:$PATH LANG=C java -jar /usr/share/selenium/selenium-server.jar -trustAllSSLCertificates -singleWindow &
 pid=$!
 i=0

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

Summary of changes:
 src/common/include/RBAC.php    |    4 ++--
 tests/func/phpunit-selenium.sh |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list