Use absolute_url to ensure baseurl and url are included in internal links

Author: dannycolin

Gemfile.lock

@@ -1,47 +1,64 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
+    coffee-script-source (1.12.2)
     colorator (1.1.0)
-    commonmarker (0.23.10)
-    concurrent-ruby (1.3.4)
-    dnsruby (1.61.9)
-      simpleidn (~> 0.1)
+    commonmarker (0.23.11)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    csv (3.3.5)
+    dnsruby (1.72.4)
+      base64 (~> 0.2.0)
+      logger (~> 1.6.5)
+      simpleidn (~> 0.2.1)
+    drb (2.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (2.5.2)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
-    ffi (1.15.5)
+    execjs (2.10.0)
+    faraday (2.13.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
+    ffi (1.17.2-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (228)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.3)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.4.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
+    gemoji (4.1.0)
+    github-pages (232)
+      github-pages-health-check (= 1.18.2)
+      jekyll (= 3.10.0)
+      jekyll-avatar (= 0.8.0)
+      jekyll-coffeescript (= 1.2.2)
+      jekyll-commonmark-ghpages (= 0.5.1)
+      jekyll-default-layout (= 0.1.5)
+      jekyll-feed (= 0.17.0)
       jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
+      jekyll-github-metadata (= 2.16.1)
       jekyll-include-cache (= 0.2.1)
       jekyll-mentions (= 1.6.0)
       jekyll-optional-front-matter (= 0.3.2)
@@ -68,30 +85,32 @@ GEM
       jekyll-theme-tactile (= 0.2.0)
       jekyll-theme-time-machine (= 0.2.0)
       jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
+      jemoji (= 0.13.0)
+      kramdown (= 2.4.0)
       kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.26.0)
+      nokogiri (>= 1.16.2, < 2.0)
+      rouge (= 3.30.0)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
+      webrick (~> 1.8)
+    github-pages-health-check (1.18.2)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 3.0, < 5.0)
+      octokit (>= 4, < 8)
+      public_suffix (>= 3.0, < 6.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.14.2)
+    html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.3)
+    jekyll (3.10.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
@@ -102,27 +121,28 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
+      webrick (>= 1.0)
+    jekyll-avatar (0.8.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
+    jekyll-coffeescript (1.2.2)
       coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
+      coffee-script-source (~> 1.12)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
+    jekyll-commonmark-ghpages (0.5.1)
+      commonmarker (>= 0.23.7, < 1.1.0)
+      jekyll (>= 3.9, < 4.0)
       jekyll-commonmark (~> 1.4.0)
       rouge (>= 2.0, < 5.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
+    jekyll-default-layout (0.1.5)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
+    jekyll-github-metadata (2.16.1)
       jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
+      octokit (>= 4, < 7, != 4.4.0)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-mentions (1.6.0)
@@ -193,41 +213,43 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
+    jemoji (0.13.0)
+      gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
     json (2.3.0)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.7.1)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.6)
     mercenary (0.3.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.25.4)
+    minitest (5.25.5)
+    net-http (0.6.0)
+      uri
     nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
+    public_suffix (5.1.1)
     racc (1.8.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.9)
-    rouge (3.26.0)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rexml (3.4.1)
+    rouge (3.30.0)
+    rubyzip (2.4.1)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -237,20 +259,17 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
+    securerandom (0.4.1)
+    simpleidn (0.2.3)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
-    webrick (1.8.2)
-    zeitwerk (2.7.1)
+    uri (1.0.3)
+    webrick (1.9.1)
 
 PLATFORMS
   x86_64-linux
@@ -263,7 +282,7 @@ DEPENDENCIES
   webrick
 
 RUBY VERSION
-   ruby 3.1.2p20
+   ruby 3.4.2p28
 
 BUNDLED WITH
    2.3.16

_config.yml

@@ -2,7 +2,7 @@ title: Bugzilla
 email: developers@bugzilla.org
 description: ""
 baseurl: ""
-url: ""
+url: "https://bugzilla.org/"
 
 sass:
   sass_dir: _sass

_includes/authors.html

@@ -3,11 +3,25 @@
   {% assign links = "" %}
   {% for author in include.authors %}
     {% assign profile = site.developers | where: "nickname", author | first %}
-    {% capture link %}<a class="muted" href="https://bugzilla.org/about/developers/{{ profile.nickname }}" target="_blank">{{ profile.firstname }} {{ profile.lastname }} ({{ profile.nickname }})</a>,{% endcapture %}
+    {%- capture link -%}
+    <a
+      class="muted"
+      href="{{ "/about/developers/" | append: profile.nickname | absolute_url }}"
+      target="_blank">
+      {{ profile.firstname }} {{ profile.lastname }} ({{ profile.nickname }})
+    </a>,
+    {%- endcapture -%}
     {% assign links = links | append: link %}
   {% endfor %}
   {% assign output = links | split: ',' | array_to_sentence_string %}
 {% else %}
-  {% capture output %}<a class="muted" href="https://bugzilla.org/about/developers/" target="_blank">Bugzilla Team</a>{% endcapture %}
+  {%- capture output -%}
+  <a
+    class="muted"
+    href="{{ "/about/developers/" | absolute_url }}"
+    target="_blank">
+    Bugzilla Team
+  </a>
+  {%- endcapture -%}
 {% endif %}
 <p class="authors muted">by {{ output }}</p>

_includes/head.html

@@ -3,12 +3,12 @@
   {% if include.page.title %}
     {%- assign title = include.page.title -%}
   {%- endif -%}
-  {%- capture image %}{{ site.url }}/assets/img/banner.png{% endcapture -%}
+  {%- capture image %}{{ "/assets/img/banner.png" | absolute_url }}{% endcapture -%}
   {% if include.page.image %}
     {% if include.page.ogtype == "profile" %}
-      {%- capture image %}{{ site.url }}/assets/img/developers/{{ include.page.image }}{% endcapture -%}
+      {%- capture image %}{{ "/assets/img/developers" | append: include.page.image | absolute_url }}{% endcapture -%}
     {% else %}
-      {%- capture image %}{{ site.url }}{{ include.page.image }}{% endcapture %}
+      {%- capture image %}{{ include.page.image | absolute_url }}{% endcapture -%}
     {% endif %}
   {%- endif -%}
   {% assign description = site.description %}
@@ -21,27 +21,37 @@
   {% if include.page.ogtype == "profile" %}
     {% capture description %}{% if include.page.former %}Former {% endif %}{{ include.page.role }}{% endcapture %}
   {% endif %}
-  {%- capture canonical %}{{ site.url }}{{ include.page.url | replace:'index.html',''}}{% endcapture %}
+  {%- capture canonical -%}
+    {{ include.page.url | replace:'index.html','' | absolute_url }}
+  {%- endcapture -%}
   <title>{% if include.page.title != True %}{{ include.page.title }} - {% endif %}{{ site.title }}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="keywords" content="bugzilla bug track tracking enterprise solution">
-  <link rel="icon" href="/assets/favicon/favicon.ico" type="image/ico">
-  <link rel="stylesheet" type="text/css" href="/assets/css/global.css">
-  <link rel="stylesheet" type="text/css" href="/assets/css/addon.css">
-  <script defer src="/assets/js/global.js"></script>
-  {% for addon in include.page.addons %}
+  <link rel="icon" href="{{ "/assets/favicon/favicon.ico" | absolute_url }}" type="image/ico">
+  <link rel="stylesheet" type="text/css" href="{{ "/assets/css/global.css" | absolute_url }}">
+  <link rel="stylesheet" type="text/css" href="{{ "/assets/css/addon.css" | absolute_url }}">
+  <script defer src="{{ "/assets/js/global.js" | absolute_url }}"></script>
+  {%- for addon in include.page.addons -%}
     {% case addon.type %}
     {% when 'js' %}
-      <script defer src="{{ addon.link }}"></script>
+      <script defer src="{{ addon.link | absolute_url }}"></script>
     {% when 'css' %}
-      <link defer rel="stylesheet" type="text/css" href="{{ addon.link }}" {% if addon.media %}media="{{ addon.media }}"{% endif %}>
+      <link
+        defer
+        rel="stylesheet"
+        type="text/css"
+        href="{{ addon.link | absolute_url }}"
+        {% if addon.media %}media="{{ addon.media }}"{% endif %}>
     {% endcase %}
-  {% endfor %}
+  {%- endfor -%}
   {% for meta in include.page.meta %}
     <{{ meta.type }} {{ meta.tags }}>
   {% endfor %}
-  <link color="#9248c8" href="/assets/favicon/mask-icon.svg" rel="mask-icon">
+  <link
+    color="#9248c8"
+    href="{{ "/assets/favicon/mask-icon.svg" | absolute_url }}"
+    rel="mask-icon">
   <meta property="og:site_name" content="{{ site.title }}">
   <meta property="og:title" content="{{ title }}">
   <meta property="og:description" content="{{ description }}" />
@@ -50,7 +60,8 @@
   {%- when "article" %}
     <meta property="article:published_time" content="{{ include.page.date | date_to_xmlschema }}">
     {% for author in include.page.author -%}
-    <meta property="article:author" content="{{ site.url }}/developers/{{ author }}">
+    <meta property="article:author"
+      content="{{ "/developers/" | append: author | absolute_url }}">
     {%- endfor %}
     {% for tag in include.page.tags -%}
     <meta property="article:tag" content="{{ tag }}">
@@ -71,6 +82,5 @@
   <meta name="twitter:site" content="@bugzilla"/>
   <meta name="twitter:creator" content="{% if include.page.twitter %}{{ include.page.twitter }}{% else %}@bugzilla{% endif %}"/>
   <meta name="theme-color" content="#9248c8">
-
   <link rel="canonical" href="{{ canonical }}">
 </head>