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 9d5f50a8861dfdee56915a82a09aec0e2c3a0a94 (commit)
via e871b26047990b5d8529a26951206c69b6c0f560 (commit)
from bb485a334190ba3ea7265e21506e4f63c1f96c82 (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=9d5f50a8861dfdee56915a82a09aec0e2c3a0a94
commit 9d5f50a8861dfdee56915a82a09aec0e2c3a0a94
Author: Franck Villaume <[email protected]>
Date: Sat Aug 27 10:02:42 2016 +0200
coding style
diff --git a/src/common/tracker/ArtifactType.class.php
b/src/common/tracker/ArtifactType.class.php
index 1615bdb..494badb 100644
--- a/src/common/tracker/ArtifactType.class.php
+++ b/src/common/tracker/ArtifactType.class.php
@@ -718,7 +718,7 @@ class ArtifactType extends FFError {
foreach($existingElements as $existingElement) {
$existingElement = new
ArtifactExtraFieldElement($nef, $existingElement);
$existingElement->delete();
- }
+ }
}
while ($el = db_fetch_array($resel)) {
//new element
@@ -769,7 +769,7 @@ class ArtifactType extends FFError {
}
}
}
- // update workflow if any
+ // update workflow
if ($nef->getType() == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
// update the allowed init values
$oatw = new ArtifactWorkflow($at, $oldEFId);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e871b26047990b5d8529a26951206c69b6c0f560
commit e871b26047990b5d8529a26951206c69b6c0f560
Author: Franck Villaume <[email protected]>
Date: Sat Aug 27 10:02:14 2016 +0200
remove trailing / since FF__core__url_prefix already provides one
diff --git a/src/etc/httpd.conf.d/vhost-list.inc
b/src/etc/httpd.conf.d/vhost-list.inc
index 3e0a637..8e66d5a 100644
--- a/src/etc/httpd.conf.d/vhost-list.inc
+++ b/src/etc/httpd.conf.d/vhost-list.inc
@@ -2,18 +2,18 @@ ServerName ${FF__core__lists_host}
ServerPath ${FF__core__url_prefix}
RewriteEngine on
-RewriteRule ^/$ ${FF__core__url_prefix}/mailman/listinfo [R=301]
+RewriteRule ^/$ ${FF__core__url_prefix}mailman/listinfo [R=301]
-ScriptAlias ${FF__core__url_prefix}/mailman/ ${FF__core__mailman_cgi_path}/
+ScriptAlias ${FF__core__url_prefix}mailman/ ${FF__core__mailman_cgi_path}/
<Directory ${FF__core__mailman_cgi_path}/>
Require all granted
</Directory>
-Alias ${FF__core__url_prefix}/pipermail /var/lib/mailman/archives/public
+Alias ${FF__core__url_prefix}pipermail /var/lib/mailman/archives/public
<Directory /var/lib/mailman/archives/public>
AllowOverride Options
Options FollowSymLinks
Require all granted
</Directory>
-Alias ${FF__core__url_prefix}/images/mailman /usr/share/images/mailman
+Alias ${FF__core__url_prefix}images/mailman /usr/share/images/mailman
diff --git a/src/etc/httpd.conf.d/vhost-main.inc
b/src/etc/httpd.conf.d/vhost-main.inc
index 5f58d33..740d0f6 100644
--- a/src/etc/httpd.conf.d/vhost-main.inc
+++ b/src/etc/httpd.conf.d/vhost-main.inc
@@ -69,27 +69,27 @@ SetEnv FF__core__config_path "${FF__core__config_path}"
</Directory>
-<Location ${FF__core__url_prefix}/projects>
+<Location ${FF__core__url_prefix}projects>
ForceType application/x-httpd-php
</Location>
-<Location ${FF__core__url_prefix}/users>
+<Location ${FF__core__url_prefix}users>
ForceType application/x-httpd-php
</Location>
IncludeOptional ${FF__core__config_path}/httpd.conf.d/plugin-*.inc
-Alias ${FF__core__url_prefix}/images/ ${FF__core__source_path}/www/images/
-Alias ${FF__core__url_prefix}/scripts/coolfieldset/
${FF__core__source_path}/vendor/coolfieldset/
-Alias ${FF__core__url_prefix}/scripts/iframe-resizer/
${FF__core__source_path}/vendor/iframe-resizer/
-Alias ${FF__core__url_prefix}/scripts/jquery/
${FF__core__source_path}/vendor/jquery/
-Alias ${FF__core__url_prefix}/scripts/jquery-ui/
${FF__core__source_path}/vendor/jquery-ui/
-Alias ${FF__core__url_prefix}/scripts/jquery-storage/
${FF__core__source_path}/vendor/jquery-storage/
-Alias ${FF__core__url_prefix}/scripts/jquery-simpletreemenu/
${FF__core__source_path}/vendor/jquery-simpletreemenu/
-Alias ${FF__core__url_prefix}/scripts/jquery-jqplot/
${FF__core__source_path}/vendor/jquery-jqplot/
-Alias ${FF__core__url_prefix}/scripts/jquery-livequery/
${FF__core__source_path}/vendor/jquery-livequery/
-Alias ${FF__core__url_prefix}/scripts/jquery-teamwork-gantt/
${FF__core__source_path}/vendor/jquery-teamwork-gantt/
-Alias ${FF__core__url_prefix}/scripts/jquery-splitter/
${FF__core__source_path}/vendor/jquery-splitter/
-Alias ${FF__core__url_prefix}/scripts/jquery-auto-height/
${FF__core__source_path}/vendor/jquery-auto-height/
+Alias ${FF__core__url_prefix}images/ ${FF__core__source_path}/www/images/
+Alias ${FF__core__url_prefix}scripts/coolfieldset/
${FF__core__source_path}/vendor/coolfieldset/
+Alias ${FF__core__url_prefix}scripts/iframe-resizer/
${FF__core__source_path}/vendor/iframe-resizer/
+Alias ${FF__core__url_prefix}scripts/jquery/
${FF__core__source_path}/vendor/jquery/
+Alias ${FF__core__url_prefix}scripts/jquery-ui/
${FF__core__source_path}/vendor/jquery-ui/
+Alias ${FF__core__url_prefix}scripts/jquery-storage/
${FF__core__source_path}/vendor/jquery-storage/
+Alias ${FF__core__url_prefix}scripts/jquery-simpletreemenu/
${FF__core__source_path}/vendor/jquery-simpletreemenu/
+Alias ${FF__core__url_prefix}scripts/jquery-jqplot/
${FF__core__source_path}/vendor/jquery-jqplot/
+Alias ${FF__core__url_prefix}scripts/jquery-livequery/
${FF__core__source_path}/vendor/jquery-livequery/
+Alias ${FF__core__url_prefix}scripts/jquery-teamwork-gantt/
${FF__core__source_path}/vendor/jquery-teamwork-gantt/
+Alias ${FF__core__url_prefix}scripts/jquery-splitter/
${FF__core__source_path}/vendor/jquery-splitter/
+Alias ${FF__core__url_prefix}scripts/jquery-auto-height/
${FF__core__source_path}/vendor/jquery-auto-height/
# For FusionForge without DNS delegation, uncomment this
# and remove 30-vhosts-projects.conf
diff --git a/src/etc/httpd.conf.d/vhost-scm-macros.inc
b/src/etc/httpd.conf.d/vhost-scm-macros.inc
index 52c68f3..8a5721b 100644
--- a/src/etc/httpd.conf.d/vhost-scm-macros.inc
+++ b/src/etc/httpd.conf.d/vhost-scm-macros.inc
@@ -9,7 +9,7 @@
# Note: when setting ITKUID, the user's groups (project memberships) are
added
# Note: it's important to set ITKGID, otherwise privilege separation breaks
as gid stays 'www-data'
- <Location ${FF__core__url_prefix}/authscm/$user/>
+ <Location ${FF__core__url_prefix}authscm/$user/>
Require user $user
</Location>
</Macro>
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/ArtifactType.class.php | 4 ++--
src/etc/httpd.conf.d/vhost-list.inc | 8 ++++----
src/etc/httpd.conf.d/vhost-main.inc | 28 ++++++++++++++--------------
src/etc/httpd.conf.d/vhost-scm-macros.inc | 2 +-
4 files changed, 21 insertions(+), 21 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
