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  e9ffa81e84b8df66d3e340aae82591157f6d9d18 (commit)
       via  a968e77ead49595fa202880e167cd0579cdbf89b (commit)
      from  46aad6e5ddd2334c31a5dbeb5863e97fd1ad2455 (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=e9ffa81e84b8df66d3e340aae82591157f6d9d18

commit e9ffa81e84b8df66d3e340aae82591157f6d9d18
Merge: 46aad6e a968e77
Author: Franck Villaume <[email protected]>
Date:   Sun Apr 28 20:13:21 2019 +0200

    Merge branch '6.1'

diff --cc src/plugins/scmgit/common/GitPlugin.class.php
index 3392f81,add6ea7..11e3bf0
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@@ -624,9 -625,8 +625,8 @@@ control over it to the project's admini
  
                fwrite($f, "\$per_request_config = sub {\n");
  
 -              fwrite($f, "push @git_base_url_list, qq,". 
forge_get_config('scm_host').('/anonscm/git') .",;\n");
 +              fwrite($f, "push @git_base_url_list, 
qq,".forge_get_config('scm_host').'/anonscm/git'.",;\n");
  
-               $protocol = forge_get_config('use_ssl', 'scmgit')? 'https' : 
'http';
                if (forge_get_config('use_smarthttp', 'scmgit')) {
                        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");
                }

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

Summary of changes:
 src/plugins/scmgit/common/GitPlugin.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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