[allura] branch master updated: Make canonical tag on activities pages overridable

[gcruz]

This is an automated email from the ASF dual-hosted git repository.

gcruz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/master by this push:
     new ab0e672a9 Make canonical tag on activities pages overridable
ab0e672a9 is described below

commit ab0e672a95949027d362b2af904ba041688072da
Author: Kenton Taylor <ktay...@slashdotmedia.com>
AuthorDate: Fri Apr 28 20:35:42 2023 +0000

    Make canonical tag on activities pages overridable
---
 ForgeActivity/forgeactivity/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ForgeActivity/forgeactivity/templates/index.html 
b/ForgeActivity/forgeactivity/templates/index.html
index 855b34e2a..3ae11a5ba 100644
--- a/ForgeActivity/forgeactivity/templates/index.html
+++ b/ForgeActivity/forgeactivity/templates/index.html
@@ -24,7 +24,7 @@
     {% if noindex %}
         <meta name="robots" content="noindex, follow">
     {%  endif %}
-    <link rel="canonical" href="{{ request.host_url ~ request.path }}">
+    <link rel="canonical" href="{{ canonical|default or (request.host_url ~ 
request.path) }}">
 {% endblock %}
 
 {% block title %}{{c.project.name}} Activity{% endblock %}