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  da21168cdad33c664ed37da9dd45288b3de3296c (commit)
      from  9a659baa6fe445585727ffdbdbf19ecb4d110545 (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=da21168cdad33c664ed37da9dd45288b3de3296c

commit da21168cdad33c664ed37da9dd45288b3de3296c
Author: Franck Villaume <[email protected]>
Date:   Mon Jun 6 18:26:07 2016 +0200

    disable Mediawiki. currently mediawiki is not supported anymore. Any help 
welcome

diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 54168bd..b5df7a3 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -33,7 +33,6 @@ if [ -e /etc/debian_version ]; then
        libapache2-mpm-itk libapache2-mod-svn \
        apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
        subversion viewvc python-pycurl git xinetd \
-       mediawiki \
        python-moinmoin libapache2-mod-wsgi python-psycopg2 \
        unoconv poppler-utils
     if ! dpkg-vendor --is Ubuntu; then
@@ -57,8 +56,5 @@ fi
         install-plugin-scmsvn install-plugin-scmgit \
         install-plugin-blocks install-plugin-moinmoin \
         install-plugin-online_help install-plugin-taskboard 
install-plugin-message
-    if [ -e /etc/debian_version ]; then
-       make install-plugin-mediawiki
-    fi
     make post-install
 )
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index 609d3f4..39c256b 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -41,7 +41,7 @@ if [ -e /etc/debian_version ]; then
        # Additional components for testsuite
        $APT install fusionforge-shell fusionforge-scm \
            fusionforge-plugin-scmgit fusionforge-plugin-scmsvn 
fusionforge-plugin-scmbzr \
-           fusionforge-plugin-mediawiki fusionforge-plugin-moinmoin \
+           fusionforge-plugin-moinmoin \
            fusionforge-plugin-blocks fusionforge-plugin-taskboard \
            fusionforge-plugin-message
        if ! dpkg-vendor --is Ubuntu; then
diff --git a/tests/func/60_PluginsMediawiki/mediawikiTest.php 
b/tests/func/60_PluginsMediawiki/mediawikiTest.php
index 1f3613c..6697bd2 100644
--- a/tests/func/60_PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/60_PluginsMediawiki/mediawikiTest.php
@@ -29,6 +29,8 @@ class PluginMediawiki extends FForge_SeleniumTestCase
 
        function testMediawiki()
        {
+               $this->skip_on_src_installs();
+               $this->skip_on_deb_installs();
                $this->skip_on_rpm_installs();
                $this->skip_on_centos();
 

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

Summary of changes:
 autoinstall/install-src.sh                       | 4 ----
 autoinstall/install.sh                           | 2 +-
 tests/func/60_PluginsMediawiki/mediawikiTest.php | 2 ++
 3 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to