[Fusionforge-commits] FusionForge branch 6.0 updated. e81845085f248eb31e2e6aa8436409a47fc2793c

Roland Mas lolando at fusionforge.org
Thu Mar 5 19:00:22 CET 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  e81845085f248eb31e2e6aa8436409a47fc2793c (commit)
       via  bd92646308022dd716d2c0e3464b65fc16458846 (commit)
       via  ec94b0a24360dd09cd44290581c69f12145214e4 (commit)
       via  49f458908fa0d378dcc29c5c361ece044df3c026 (commit)
      from  b99a36a8fac6531ea821244fe695e140d957752a (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 e81845085f248eb31e2e6aa8436409a47fc2793c
Author: Roland Mas <lolando at debian.org>
Date:   Thu Mar 5 18:51:47 2015 +0100

    Fixed hardcoded path

diff --git a/src/templates/httpd.conf.d/vhost-main.inc b/src/templates/httpd.conf.d/vhost-main.inc
index a1de41b..cd860d6 100644
--- a/src/templates/httpd.conf.d/vhost-main.inc
+++ b/src/templates/httpd.conf.d/vhost-main.inc
@@ -29,7 +29,7 @@ IncludeOptional {core/config_path}/httpd.conf.d/plugin-*.inc
 
 Alias /images/ {core/source_path}/www/images/
 Alias /scripts/coolfieldset/ {core/source_path}/vendor/coolfieldset/
-Alias /scripts/iframe-resizer/ /usr/local/share/fusionforge/vendor/iframe-resizer/
+Alias /scripts/iframe-resizer/ {core/source_path}/vendor/iframe-resizer/
 Alias /scripts/jquery/ {core/source_path}/vendor/jquery/
 Alias /scripts/jquery-ui/ {core/source_path}/vendor/jquery-ui/
 Alias /scripts/jquery-storage/ {core/source_path}/vendor/jquery-storage/

commit bd92646308022dd716d2c0e3464b65fc16458846
Author: Roland Mas <lolando at debian.org>
Date:   Thu Mar 5 18:48:17 2015 +0100

    Fixed URL when testsuite calls gitweb directly rather than following links

diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index 713e18f..ebf19cb 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -114,7 +114,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->assertTextNotPresent("projecta.git");
 
         // Now try to use the authenticated gitweb
-        $this->open("http://".FORGE_ADMIN_USERNAME.":".FORGE_ADMIN_PASSWORD."@scm.".HOST.ROOT."/authscm/".FORGE_ADMIN_USERNAME."/gitweb/projecta/");
+        $this->open("http://".FORGE_ADMIN_USERNAME.":".FORGE_ADMIN_PASSWORD."@scm.".HOST.ROOT."/authscm/".FORGE_ADMIN_USERNAME."/gitweb/?p=projecta/projecta.git");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextPresent("projecta.git");
 
@@ -153,14 +153,14 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->waitSystasks();
 
         // Try with a different user
-        $this->open("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/otheruser/gitweb/projecta/");
+        $this->open("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/otheruser/gitweb/?p=projecta/projecta.git");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextNotPresent("projecta.git");
 
         // Test accessing admin's URL with otheruser's credentials (and asserting we get a 401)
         // …Selenium doesn't allow checking HTTP return codes, so use a file_get_contents() hack
         // First make sure that the hack works
-        $f = @file_get_contents("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/otheruser/gitweb/projecta/", "r");
+        $f = @file_get_contents("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/otheruser/gitweb/", "r");
         $this->assertTrue(is_string($f));
         $this->assertEquals(1, preg_match('/projectb.git/',$f));
         // Then make sure we detect a failure

commit ec94b0a24360dd09cd44290581c69f12145214e4
Author: Roland Mas <lolando at debian.org>
Date:   Thu Mar 5 18:40:05 2015 +0100

    Fixed iframe handling in testsuite

diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index e5242fd..713e18f 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -82,6 +82,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=projecta.git");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextPresent("Adding file");
+		$this->selectFrame("relative=top");
 
         // Check gitweb directly
         $this->open("http://scm.".HOST.ROOT."/anonscm/gitweb/?p=projecta/projecta.git");
@@ -116,7 +117,6 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
         $this->open("http://".FORGE_ADMIN_USERNAME.":".FORGE_ADMIN_PASSWORD."@scm.".HOST.ROOT."/authscm/".FORGE_ADMIN_USERNAME."/gitweb/projecta/");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextPresent("projecta.git");
-		$this->selectFrame("relative=top");
 
 		// Also check via the standard page
 		$this->open(ROOT);

commit 49f458908fa0d378dcc29c5c361ece044df3c026
Author: Roland Mas <lolando at debian.org>
Date:   Thu Mar 5 18:38:51 2015 +0100

    gitweb config tweaks, removing hardcoded URL

diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index 233e1a8..5fe68f8 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -611,7 +611,7 @@ control over it to the project's administrator.");
 		fwrite($f, "\$favicon = '". util_make_url('/plugins/scmgit/git-favicon.png')."';\n");
 		fwrite($f, "\$stylesheet = '". util_make_url('/plugins/scmgit/gitweb.css')."';\n");
 		fwrite($f, "\$javascript = '". util_make_url('/plugins/scmgit/gitweb.js')."';\n");
-		fwrite($f, "\$site_header = '" . forge_get_config('plugins_path') . "/scmgit/www/iframeResizer.contentWindow.html';\n");
+		fwrite($f, "\$site_html_head_string = '<script type=\"text/javascript\" src=\"". util_make_url('/scripts/iframe-resizer/iframeResizer.contentWindow.min.js'). "\" />';\n");
 		fwrite($f, "\$prevent_xss = 'true';\n");
 		fwrite($f, "\$feature{'actions'}{'default'} = [('project home', '" .
 		       util_make_url('/plugins/scmgit/?func=grouppage/%n') .
@@ -623,11 +623,11 @@ control over it to the project's administrator.");
 
 		$protocol = forge_get_config('use_ssl', 'scmgit')? 'https' : 'http';
 		if (forge_get_config('use_smarthttp', 'scmgit')) {
-				fwrite($f, "if (defined \$ENV{ITKUID}) { push @git_base_url_list, qq,$protocol://\$ENV{ITKUID}\@".forge_get_config('scm_host')."/authscm/\$ENV{ITKUID}/git,; }\n");
+			fwrite($f, "if (defined \$ENV{ITKUID} && \$ENV{ITKUID} ne '".forge_get_config('apache_user')."') { push @git_base_url_list, qq,$protocol://\$ENV{ITKUID}\@".forge_get_config('scm_host')."/authscm/\$ENV{ITKUID}/git,; }\n");
 		}
 
 		if (forge_get_config('use_ssh', 'scmgit')) {
-				fwrite($f, "if (defined \$ENV{ITKUID}) { push @git_base_url_list, qq,git+ssh://\$ENV{ITKUID}\@".forge_get_config('scm_host').forge_get_config('repos_path', 'scmgit').",; }\n");
+				fwrite($f, "if (defined \$ENV{ITKUID} && \$ENV{ITKUID} ne '".forge_get_config('apache_user')."') { push @git_base_url_list, qq,git+ssh://\$ENV{ITKUID}\@".forge_get_config('scm_host').forge_get_config('repos_path', 'scmgit').",; }\n");
 		}
 
 		fwrite($f, "};\n");
diff --git a/src/plugins/scmgit/www/iframeResizer.contentWindow.html b/src/plugins/scmgit/www/iframeResizer.contentWindow.html
deleted file mode 100644
index 0c2509f..0000000
--- a/src/plugins/scmgit/www/iframeResizer.contentWindow.html
+++ /dev/null
@@ -1 +0,0 @@
-<script type="text/javascript" src="https://debian8.local/scripts/iframe-resizer/iframeResizer.contentWindow.min.js" />

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

Summary of changes:
 src/plugins/scmgit/common/GitPlugin.class.php           |    6 +++---
 src/plugins/scmgit/www/iframeResizer.contentWindow.html |    1 -
 src/templates/httpd.conf.d/vhost-main.inc               |    2 +-
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php        |    8 ++++----
 4 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 src/plugins/scmgit/www/iframeResizer.contentWindow.html


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list