From a1570ff3dd60b0ceb11f8100adde6d6319b14ef0 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Thu, 23 Mar 2023 02:47:14 +0000 Subject: [PATCH] web: Save a needless 301 redirect from /integrations to /integrations/. --- api_docs/incoming-webhooks-overview.md | 2 +- api_docs/index.md | 2 +- api_docs/integrations-overview.md | 2 +- docs/documentation/overview.md | 2 +- docs/overview/architecture-overview.md | 2 +- help/bots-and-integrations.md | 2 +- help/change-organization-url.md | 2 +- help/import-from-gitter.md | 2 +- help/include/import-get-your-organization-started.md | 2 +- help/include/set-up-integrations.md | 2 +- help/resolve-a-topic.md | 2 +- help/setting-up-zulip-for-a-class.md | 2 +- requirements/common.in | 2 +- templates/corporate/features.html | 2 +- templates/corporate/for/business.html | 2 +- templates/corporate/for/education.html | 2 +- templates/corporate/for/open-source.html | 2 +- templates/corporate/hello.html | 2 +- templates/corporate/pricing_model.html | 2 +- templates/zerver/integrations/index.html | 6 +++--- .../spiders/check_help_documentation.py | 2 +- web/src/portico/integrations.js | 2 +- web/templates/gear_menu.hbs | 2 +- web/templates/settings/bot_settings.hbs | 2 +- zerver/lib/integrations.py | 2 +- zerver/lib/markdown/help_relative_links.py | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/api_docs/incoming-webhooks-overview.md b/api_docs/incoming-webhooks-overview.md index e9b027962d..df925df2a8 100644 --- a/api_docs/incoming-webhooks-overview.md +++ b/api_docs/incoming-webhooks-overview.md @@ -16,7 +16,7 @@ Zulip: * Adding an incoming webhook integration (detailed on this page), where all the logic for formatting the Zulip messages lives in the Zulip server. This is how most of [Zulip's official - integrations](/integrations) work, because they enable Zulip to + integrations](/integrations/) work, because they enable Zulip to support third-party services that just have an "outgoing webhook" feature (without the third party needing to do any work specific to Zulip). diff --git a/api_docs/index.md b/api_docs/index.md index c4a12f76a9..a9ef7167c4 100644 --- a/api_docs/index.md +++ b/api_docs/index.md @@ -4,7 +4,7 @@ Zulip's APIs allow you to integrate other services with Zulip. This guide should help you find the API you need: * First, check if the tool you'd like to integrate with Zulip - [already has a native integration](/integrations). + [already has a native integration](/integrations/). * Next, check if [Zapier](https://zapier.com/apps) or [IFTTT](https://ifttt.com/search) has an integration. [Zulip's Zapier integration](/integrations/doc/zapier) and diff --git a/api_docs/integrations-overview.md b/api_docs/integrations-overview.md index cbe70038bc..465a3cf9e8 100644 --- a/api_docs/integrations-overview.md +++ b/api_docs/integrations-overview.md @@ -16,7 +16,7 @@ possible. Most existing integrations send content from a third-party product into Zulip. -* Search Zulip's [list of native integrations](/integrations) for the +* Search Zulip's [list of native integrations](/integrations/) for the third-party product. Each integration has a page describing how to set it up. diff --git a/docs/documentation/overview.md b/docs/documentation/overview.md index 2d9911215d..d79af7d625 100644 --- a/docs/documentation/overview.md +++ b/docs/documentation/overview.md @@ -107,7 +107,7 @@ See our guide on [writing help center articles](helpcenter.md). ### Integrations documentation -Zulip's [integrations documentation](https://zulip.com/integrations) +Zulip's [integrations documentation](https://zulip.com/integrations/) is user-facing documentation explaining to end users how to set up each of Zulip's more than 100 integrations. There is a detailed [guide on documenting integrations](integrations.md), including style guidelines diff --git a/docs/overview/architecture-overview.md b/docs/overview/architecture-overview.md index a48dae803c..d409188ca0 100644 --- a/docs/overview/architecture-overview.md +++ b/docs/overview/architecture-overview.md @@ -5,7 +5,7 @@ The main Zulip codebase is at . It contains the Zulip backend (written in Python 3.x and Django), the web app (written in JavaScript and TypeScript) and our library of -incoming webhook [integrations](https://zulip.com/integrations) +incoming webhook [integrations](https://zulip.com/integrations/) with other services and applications (see [the directory structure guide](directory-structure.md)). diff --git a/help/bots-and-integrations.md b/help/bots-and-integrations.md index 93e10ac29a..24659e16f3 100644 --- a/help/bots-and-integrations.md +++ b/help/bots-and-integrations.md @@ -14,7 +14,7 @@ A bot that sends content to or from another product is often called an Zulip natively supports integrations with over one hundred products, and with almost a thousand more through Zapier and IFTTT. If you're looking to add an integration with an existing product, see our -[list of integrations](/integrations), along with those of +[list of integrations](/integrations/), along with those of [Zapier](https://zapier.com/apps) and [IFTTT](https://ifttt.com/search). ## Anatomy of a bot diff --git a/help/change-organization-url.md b/help/change-organization-url.md index 0568b323d4..ff5aa3d975 100644 --- a/help/change-organization-url.md +++ b/help/change-organization-url.md @@ -5,7 +5,7 @@ organization URL is a disruptive operation for users: * Users will be logged out of existing sessions on the web, mobile and desktop apps and need to log in again. -* Any [API clients](/api) or [integrations](/integrations) will need +* Any [API clients](/api) or [integrations](/integrations/) will need to be updated to point to the new organization URL. We recommend using a [wildcard diff --git a/help/import-from-gitter.md b/help/import-from-gitter.md index 087325c5c7..e22ef2f871 100644 --- a/help/import-from-gitter.md +++ b/help/import-from-gitter.md @@ -163,7 +163,7 @@ Once the import process is completed, you will need to: 4. Share the URL for your new Zulip organization, and (recommended) the [Getting started with Zulip guide](/help/getting-started-with-zulip). -5. Migrate any [integrations](/integrations). +5. Migrate any [integrations](/integrations/). {end_tabs} diff --git a/help/include/import-get-your-organization-started.md b/help/include/import-get-your-organization-started.md index 72b9d85b15..3d2f2059d6 100644 --- a/help/include/import-get-your-organization-started.md +++ b/help/include/import-get-your-organization-started.md @@ -16,6 +16,6 @@ Once the import process is completed, you will need to: 3. Share the URL for your new Zulip organization, and (recommended) the [Getting started with Zulip guide](/help/getting-started-with-zulip). -4. Migrate any [integrations](/integrations). +4. Migrate any [integrations](/integrations/). {end_tabs} diff --git a/help/include/set-up-integrations.md b/help/include/set-up-integrations.md index 5cb511a8ba..9586421b69 100644 --- a/help/include/set-up-integrations.md +++ b/help/include/set-up-integrations.md @@ -6,7 +6,7 @@ more through [Zapier](/integrations/doc/zapier) and [Sentry](/integrations/doc/sentry) and [Twitter](/integrations/doc/twitter). -* The [integrations page](/integrations) has instructions for +* The [integrations page](/integrations/) has instructions for integrating with each product. * If you don't see an integration you need, you can [request it](/help/request-an-integration). * You can also [create custom integrations](/api/integrations-overview) using our API. diff --git a/help/resolve-a-topic.md b/help/resolve-a-topic.md index 5722a4b0de..d3d1973a23 100644 --- a/help/resolve-a-topic.md +++ b/help/resolve-a-topic.md @@ -94,7 +94,7 @@ topics](/help/restrict-moving-messages). * Resolving a topic works by moving the messages to a new topic. * Like with all topic editing, Zulip clients update instantly, so human users will likely only send messages to the resolved topic. -* [Integrations](/integrations) will usually send new messages to the +* [Integrations](/integrations/) will usually send new messages to the original topic (`example topic`) after a topic is resolved. This is useful for alerting integrations, where a repeating alert might have a different cause. You can mark the topic resolved (as normal) once diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index a7e2dd9231..3099e558da 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -321,7 +321,7 @@ more through [Zapier](/integrations/doc/zapier) and [IFTTT](/integrations/doc/ifttt). Popular Zulip integrations include [GitHub](/integrations/doc/github) and [Twitter](/integrations/doc/twitter). The [integrations -page](/integrations) has instructions for integrating with each +page](/integrations/) has instructions for integrating with each product. ## Cleaning up at the end of a class diff --git a/requirements/common.in b/requirements/common.in index c1bbda1194..90b3bf8d6b 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -110,7 +110,7 @@ python-magic # The Zulip API bindings, from its own repository. We integrate with # these tightly, including fetching content not included in the official # PyPI release tarballs, such as logos, assets and documentation files -# that we render on our /integrations page. Therefore, we need to pin +# that we render on our /integrations/ page. Therefore, we need to pin # the version from Git rather than a PyPI release. Keeping everything in # one repository simplifies the process of implementing and documenting # new bots for new contributors. diff --git a/templates/corporate/features.html b/templates/corporate/features.html index 7a7db9fdfd..57bb5744ec 100644 --- a/templates/corporate/features.html +++ b/templates/corporate/features.html @@ -109,7 +109,7 @@

Apps, integrations, and API.

- +

INTEGRATIONS

Get alerts and updates from your favorite services with diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 7f36082799..5a8742d678 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -243,7 +243,7 @@

Native integrations for GitHub, Jira, PagerDuty, Sentry - and hundreds of + and hundreds of other tools can initiate new topics, creating lightweight discussion spaces for each issue. diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index 14d33044ec..6b21bc7be8 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -260,7 +260,7 @@
  • 10,000 messages of search history
  • File storage up to 5 GB total
  • Full-featured team chat service
    • -
  • Hundreds of integrations
    • +
  • Hundreds of integrations
  • Advanced roles and permissions
    • diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index de743a1a06..07cc7f0cfa 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -474,7 +474,7 @@
  • Native integrations for GitHub, Jira, Twitter, Sentry - and hundreds of + and hundreds of other tools can initiate new topics, creating lightweight discussion spaces for each issue. diff --git a/templates/corporate/hello.html b/templates/corporate/hello.html index bb7f0264f1..aded33e2ee 100644 --- a/templates/corporate/hello.html +++ b/templates/corporate/hello.html @@ -396,7 +396,7 @@ and IFTTT.

    -

    See all available integrations.

    +

    See all available integrations.

    diff --git a/templates/corporate/pricing_model.html b/templates/corporate/pricing_model.html index 619bbe2b84..de4ad90d4f 100644 --- a/templates/corporate/pricing_model.html +++ b/templates/corporate/pricing_model.html @@ -19,7 +19,7 @@
  • 10,000 messages of search history
  • File storage up to 5 GB total
  • Full-featured team chat service
    • -
  • Hundreds of integrations
    • +
  • Hundreds of integrations
  • Advanced roles and permissions
  • Guest accounts
    • diff --git a/templates/zerver/integrations/index.html b/templates/zerver/integrations/index.html index c2e4ddd938..ce73f64291 100644 --- a/templates/zerver/integrations/index.html +++ b/templates/zerver/integrations/index.html @@ -48,7 +48,7 @@
    - +

    All

     {% for category in categories_dict.keys() %} @@ -74,7 +74,7 @@

    {% trans %}Categories{% endtrans %}

    - +

    {% trans %}All{% endtrans %}

     {% for category in categories_dict.keys() %} @@ -143,7 +143,7 @@
    {% for integration in integrations_dict.values() %} diff --git a/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py b/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py index 3eaf50b0bb..2f430ebd8d 100644 --- a/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py +++ b/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py @@ -69,7 +69,7 @@ class PorticoDocumentationSpider(BaseDocumentationSpider): "http://localhost:9981/plans", "http://localhost:9981/team", "http://localhost:9981/apps", - "http://localhost:9981/integrations", + "http://localhost:9981/integrations/", "http://localhost:9981/terms", "http://localhost:9981/privacy", "http://localhost:9981/features", diff --git a/web/src/portico/integrations.js b/web/src/portico/integrations.js index d83cfbda40..d066231e56 100644 --- a/web/src/portico/integrations.js +++ b/web/src/portico/integrations.js @@ -361,7 +361,7 @@ function integration_events() { }); $(window).on("popstate", () => { - if (window.location.pathname.startsWith("/integrations")) { + if (window.location.pathname.startsWith("/integrations/")) { dispatch("LOAD_PATH"); } else { window.location = window.location.href; diff --git a/web/templates/gear_menu.hbs b/web/templates/gear_menu.hbs index 824257b289..f8a31bafac 100644 --- a/web/templates/gear_menu.hbs +++ b/web/templates/gear_menu.hbs @@ -124,7 +124,7 @@ diff --git a/web/templates/settings/bot_settings.hbs b/web/templates/settings/bot_settings.hbs index 85ec703a8f..3326236230 100644 --- a/web/templates/settings/bot_settings.hbs +++ b/web/templates/settings/bot_settings.hbs @@ -4,7 +4,7 @@
    {{#tr}} Looking for our integrations or API documentation? - {{#*inline "z-integrations"}}{{> @partial-block}}{{/inline}} + {{#*inline "z-integrations"}}{{> @partial-block}}{{/inline}} {{#*inline "z-api"}}{{> @partial-block}}{{/inline}} {{/tr}}
    diff --git a/zerver/lib/integrations.py b/zerver/lib/integrations.py index a105b40719..3b88a9adc6 100644 --- a/zerver/lib/integrations.py +++ b/zerver/lib/integrations.py @@ -12,7 +12,7 @@ from zerver.lib.storage import static_path """This module declares all of the (documented) integrations available in the Zulip server. The Integration class is used as part of -generating the documentation on the /integrations page, while the +generating the documentation on the /integrations/ page, while the WebhookIntegration class is also used to generate the URLs in `zproject/urls.py` for webhook integrations. diff --git a/zerver/lib/markdown/help_relative_links.py b/zerver/lib/markdown/help_relative_links.py index 1a15f6b7f8..ddd0a5743b 100644 --- a/zerver/lib/markdown/help_relative_links.py +++ b/zerver/lib/markdown/help_relative_links.py @@ -21,7 +21,7 @@ gear_info = { "manage-streams": ["Manage streams", "/#streams/subscribed"], "settings": ["Personal Settings", "/#settings/profile"], "organization-settings": ["Organization settings", "/#organization/organization-profile"], - "integrations": ["Integrations", "/integrations"], + "integrations": ["Integrations", "/integrations/"], "stats": ["Usage statistics", "/stats"], "plans": ["Plans and pricing", "/plans"], "billing": ["Billing", "/billing"],