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 170ae69ba81b331f5632671855eeb6c42415add6 (commit)
via 57c0d1cbe9d54c9a64541f26d056b75c1e9a0373 (commit)
from 70881e5e66614749a3de4c7351066336f5c42673 (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=170ae69ba81b331f5632671855eeb6c42415add6
commit 170ae69ba81b331f5632671855eeb6c42415add6
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jun 17 11:29:36 2016 +0200
No public needed for function __construct
diff --git
a/src/plugins/oslc/include/oslc-zend/application/controllers/MantisCmController.php
b/src/plugins/oslc/include/oslc-zend/application/controllers/MantisCmController.php
index 90b8613..31ac974 100644
---
a/src/plugins/oslc/include/oslc-zend/application/controllers/MantisCmController.php
+++
b/src/plugins/oslc/include/oslc-zend/application/controllers/MantisCmController.php
@@ -51,7 +51,7 @@ class MantisCmController extends CmController{
return self::$supportedAcceptMimeTypes;
}
- /*public function __construct(){
+ /*function __construct(){
// just merge Mantis specifc action mime types with the default
set
// of supported actions mime types in OSLC-CM
$this->getSupportedAcceptMimeTypes =
array_merge(CmController::getSupportedAcceptMimeTypes(),
$this->mantisSupportedAcceptMimeTypes);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=57c0d1cbe9d54c9a64541f26d056b75c1e9a0373
commit 57c0d1cbe9d54c9a64541f26d056b75c1e9a0373
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jun 17 11:28:56 2016 +0200
Whitespace
diff --git
a/src/plugins/oslc/include/oslc-zend/application/controllers/CmController.php
b/src/plugins/oslc/include/oslc-zend/application/controllers/CmController.php
index 0dc1af8..80763f9 100644
---
a/src/plugins/oslc/include/oslc-zend/application/controllers/CmController.php
+++
b/src/plugins/oslc/include/oslc-zend/application/controllers/CmController.php
@@ -237,9 +237,9 @@ class CmController extends Zend_Rest_Controller {
}
public function headAction(){
-
+
//$this->_forward('index');
-
+
}
public function getAction(){
-----------------------------------------------------------------------
Summary of changes:
.../oslc/include/oslc-zend/application/controllers/CmController.php | 4 ++--
.../include/oslc-zend/application/controllers/MantisCmController.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits