From 31978e713a723158752599827cf16f69e64e4447 Mon Sep 17 00:00:00 2001 From: David Flanagan Date: Fri, 11 Jan 2019 16:16:43 -0800 Subject: [PATCH] Bug 1518844: convert bugzilla links to github links This is a followup patch for https://github.com/mozilla/kuma/pull/5183 That original PR changed the content bug reporting link in the navigation header, but missed it in the 404 page and in a few other places. This patch removes all instances of "form.doc" from the Kuma source code. --- jinja2/404.html | 2 +- kuma/static/layout-tests/iex-unused-css.html | 2 +- kuma/static/layout-tests/no-bcd-contributors-sidebar.html | 2 +- kuma/static/layout-tests/no-iex-bcd-contributors-sidebar.html | 2 +- kuma/static/layout-tests/no-inline-js.html | 2 +- kuma/static/layout-tests/no-js.html | 2 +- kuma/static/layout-tests/no-js/no-bcd.html | 2 +- kuma/static/layout-tests/no-js/no-contributors.html | 2 +- kuma/static/layout-tests/no-js/no-iex.html | 2 +- kuma/static/layout-tests/no-js/no-sidebar-contributors.html | 2 +- kuma/static/layout-tests/no-js/no-sidebar.html | 2 +- .../static/layout-tests/normal-no-bcd-contributors-sidebar.html | 2 +- kuma/static/layout-tests/normal.html | 2 +- kuma/static/layout-tests/raw-html.html | 2 +- kuma/static/layout-tests/unused-css.html | 2 +- kuma/wiki/constants.py | 2 +- tests/pages/notfound.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jinja2/404.html b/jinja2/404.html index 529ab5d782..ec9b6fed98 100644 --- a/jinja2/404.html +++ b/jinja2/404.html @@ -26,7 +26,7 @@

{{_('Not Found')}}

You can try a search or start over on the home page. {% endtrans %}

-

{% trans bug_form_url='https://bugzilla.mozilla.org/form.doc' %} +

{% trans bug_form_url='https://github.com/mdn/sprints/issues/new?template=issue-template.md&projects=mdn/sprints/2&labels=user-report' %} If you were following a documentation link, you can sign in and create the page. Otherwise, please file a bug. Thanks! {% endtrans %}

diff --git a/kuma/static/layout-tests/iex-unused-css.html b/kuma/static/layout-tests/iex-unused-css.html index 8facd434ce..d82b2f4351 100644 --- a/kuma/static/layout-tests/iex-unused-css.html +++ b/kuma/static/layout-tests/iex-unused-css.html @@ -326,7 +326,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-bcd-contributors-sidebar.html b/kuma/static/layout-tests/no-bcd-contributors-sidebar.html index 8098cffafc..0bc36f1f93 100644 --- a/kuma/static/layout-tests/no-bcd-contributors-sidebar.html +++ b/kuma/static/layout-tests/no-bcd-contributors-sidebar.html @@ -326,7 +326,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-iex-bcd-contributors-sidebar.html b/kuma/static/layout-tests/no-iex-bcd-contributors-sidebar.html index af11f9b754..980c0b7eae 100644 --- a/kuma/static/layout-tests/no-iex-bcd-contributors-sidebar.html +++ b/kuma/static/layout-tests/no-iex-bcd-contributors-sidebar.html @@ -326,7 +326,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-inline-js.html b/kuma/static/layout-tests/no-inline-js.html index 0ee9d454ee..fe02967da3 100644 --- a/kuma/static/layout-tests/no-inline-js.html +++ b/kuma/static/layout-tests/no-inline-js.html @@ -209,7 +209,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-js.html b/kuma/static/layout-tests/no-js.html index 9fccf850bf..1d0d77c807 100644 --- a/kuma/static/layout-tests/no-js.html +++ b/kuma/static/layout-tests/no-js.html @@ -208,7 +208,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-js/no-bcd.html b/kuma/static/layout-tests/no-js/no-bcd.html index c6b9283d9c..4def434bc5 100644 --- a/kuma/static/layout-tests/no-js/no-bcd.html +++ b/kuma/static/layout-tests/no-js/no-bcd.html @@ -208,7 +208,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-js/no-contributors.html b/kuma/static/layout-tests/no-js/no-contributors.html index a2d066bfcd..7bb16b3ee0 100644 --- a/kuma/static/layout-tests/no-js/no-contributors.html +++ b/kuma/static/layout-tests/no-js/no-contributors.html @@ -208,7 +208,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-js/no-iex.html b/kuma/static/layout-tests/no-js/no-iex.html index 722d3fc728..9a15adc8db 100644 --- a/kuma/static/layout-tests/no-js/no-iex.html +++ b/kuma/static/layout-tests/no-js/no-iex.html @@ -208,7 +208,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-js/no-sidebar-contributors.html b/kuma/static/layout-tests/no-js/no-sidebar-contributors.html index 44568e38bc..99e748c2b5 100644 --- a/kuma/static/layout-tests/no-js/no-sidebar-contributors.html +++ b/kuma/static/layout-tests/no-js/no-sidebar-contributors.html @@ -208,7 +208,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/no-js/no-sidebar.html b/kuma/static/layout-tests/no-js/no-sidebar.html index 4c2da5f3ed..d1fd33cfcd 100644 --- a/kuma/static/layout-tests/no-js/no-sidebar.html +++ b/kuma/static/layout-tests/no-js/no-sidebar.html @@ -208,7 +208,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/normal-no-bcd-contributors-sidebar.html b/kuma/static/layout-tests/normal-no-bcd-contributors-sidebar.html index 7b1dfb0c11..4ca8e0fe93 100644 --- a/kuma/static/layout-tests/normal-no-bcd-contributors-sidebar.html +++ b/kuma/static/layout-tests/normal-no-bcd-contributors-sidebar.html @@ -329,7 +329,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/normal.html b/kuma/static/layout-tests/normal.html index 9d5b995a41..d942ff075f 100644 --- a/kuma/static/layout-tests/normal.html +++ b/kuma/static/layout-tests/normal.html @@ -334,7 +334,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/raw-html.html b/kuma/static/layout-tests/raw-html.html index 4a598067a6..3aa6c6f0d5 100644 --- a/kuma/static/layout-tests/raw-html.html +++ b/kuma/static/layout-tests/raw-html.html @@ -186,7 +186,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/static/layout-tests/unused-css.html b/kuma/static/layout-tests/unused-css.html index 65e80b8074..81ad97627c 100644 --- a/kuma/static/layout-tests/unused-css.html +++ b/kuma/static/layout-tests/unused-css.html @@ -326,7 +326,7 @@ Join the MDN community
  • - Report a content problem + Report a content problem diff --git a/kuma/wiki/constants.py b/kuma/wiki/constants.py index b9d07f7303..d51d47a179 100644 --- a/kuma/wiki/constants.py +++ b/kuma/wiki/constants.py @@ -262,4 +262,4 @@ 'FXOSUXLiveSampleEmbed', ] -DEV_DOC_REQUEST_FORM = 'https://bugzilla.mozilla.org/form.doc' +DEV_DOC_REQUEST_FORM = 'https://github.com/mdn/sprints/issues/new?template=issue-template.md&projects=mdn/sprints/2&labels=user-report' diff --git a/tests/pages/notfound.py b/tests/pages/notfound.py index fe5a493753..84d36e21a8 100644 --- a/tests/pages/notfound.py +++ b/tests/pages/notfound.py @@ -9,7 +9,7 @@ class NotFoundPage(BasePage): URL_TEMPLATE = '/{locale}/' + SLUG _page_title = (By.CSS_SELECTOR, '#content-main > h1') - report_content_form_url = 'https://bugzilla.mozilla.org/form.doc' + report_content_form_url = 'https://github.com/mdn/sprints/issues/new?template=issue-template.md&projects=mdn/sprints/2&labels=user-report' _report_content_locator = (By.CSS_SELECTOR, '#content-main a[href^="' + report_content_form_url + '"]')