Merge ~cjwatson/launchpad-layers:supermirror-root-trailing-slash into launchpad-layers:main

Proposed by Colin Watson
Status: Merged
Merged at revision: 81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f
Proposed branch: ~cjwatson/launchpad-layers:supermirror-root-trailing-slash
Merge into: launchpad-layers:main
Diff against target: 13 lines (+1/-1)
1 file modified
launchpad-base/templates/launchpad-base-lazr.conf (+1/-1)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Review via email: mp+441489@code.launchpad.net

Commit message

Add trailing slash to supermirror_root

Description of the change

`lp.code.browser.branchref.BranchRefNavigation.traverse_branch` expects a trailing slash here, and generates broken URLs if it doesn't get one.

To post a comment you must log in.
Revision history for this message
Simone Pelosi (pelpsi) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/launchpad-base/templates/launchpad-base-lazr.conf b/launchpad-base/templates/launchpad-base-lazr.conf
2index 7f69d9b..71c456e 100644
3--- a/launchpad-base/templates/launchpad-base-lazr.conf
4+++ b/launchpad-base/templates/launchpad-base-lazr.conf
5@@ -32,7 +32,7 @@ codehosting_endpoint: http://{{ domain_xmlrpc_private }}:{{ port_xmlrpc }}/codeh
6 {{- opt("internal_bzr_api_endpoint", internal_bzr_api_endpoint) }}
7 lp_url_hosts: {{ bzr_lp_url_hosts }}
8 secure_codebrowse_root: https://{{ domain_bzr }}/
9-supermirror_root: http://{{ domain_bzr }}
10+supermirror_root: http://{{ domain_bzr }}/
11 {%- endif %}
12 {%- if domain_git %}
13 internal_git_api_endpoint: http://{{ domain_git }}:19417/

Subscribers

People subscribed via source and target branches