Bug 1388914: Redirect /thunderbird to thunderbird.net

Catch the case where there is no slash
mozilla · Apr 17, 2018 · 4455862 · 4455862
1 parent 6858eb8
commit 4455862
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bedrock/redirects/redirects.py b/bedrock/redirects/redirects.py
@@ -2061,7 +2061,7 @@
              'https://www.thunderbird.net/thunderbird/{version}/releasenotes/'),
     redirect(r'^thunderbird/(?P<version>[^/]+)/system-requirements/$',
              'https://www.thunderbird.net/thunderbird/{version}/system-requirements/'),
-    redirect(r'^thunderbird/(?P<path>.*)', 'https://www.thunderbird.net/{path}'),
+    redirect(r'^thunderbird/?(?P<path>.*)', 'https://www.thunderbird.net/{path}'),
     redirect('^tinderbox\.html$', 'http://developer.mozilla.org/en/Tinderbox'),
     redirect('^tools\.html$', 'http://developer.mozilla.org/en/Mozilla_Development_Tools'),
     redirect('^university/courses\.html$', 'http://education.mozilla.org'),

diff --git a/tests/redirects/map_globalconf.py b/tests/redirects/map_globalconf.py
@@ -239,7 +239,7 @@
     url_test('/en-US/projects/calendar/random/stuff/', 'https://www.thunderbird.net/calendar/'),
 
     # bug 1388914
-    url_test('/thunderbird/', 'https://www.thunderbird.net/'),
+    url_test('/thunderbird{,/}', 'https://www.thunderbird.net/'),
     url_test('/thunderbird/channel/', 'https://www.thunderbird.net/channel/'),
     url_test('/thunderbird/features/', 'https://www.thunderbird.net/features/'),
     url_test('/thunderbird/52.6.0/releasenotes/', 'https://www.thunderbird.net/thunderbird/52.6.0/releasenotes/'),