merge queue: checking #12598 on main (e8e1d66), stacked on #12717

src/components/StructuredData.astro

@@ -0,0 +1,116 @@
+---
+import type { CollectionEntry } from 'astro:content';
+
+/**
+ * Schema.org JSON-LD describing who Mergify is and what the current page is.
+ *
+ * Search engines and agents both use this for entity resolution — "who publishes
+ * these docs, how do I contact them, what product is this about" — which is
+ * otherwise only inferable from prose. Emitted as a single `@graph` so the
+ * Organization node is declared once and referenced by the others.
+ */
+
+export interface Props {
+  content: CollectionEntry<'docs'>['data'];
+  canonicalURL: URL;
+}
+
+const { content, canonicalURL } = Astro.props;
+const site = Astro.site?.origin ?? 'https://docs.mergify.com';
+const isHomepage = canonicalURL.pathname === '/';
+
+const organization = {
+  '@type': 'Organization',
+  '@id': 'https://mergify.com/#organization',
+  name: 'Mergify',
+  url: 'https://mergify.com/',
+  description:
+    'Mergify is a merge queue and CI optimization platform for engineering teams on GitHub.',
+  email: 'support@mergify.com',
+  address: {
+    '@type': 'PostalAddress',
+    streetAddress: '15 rue Pierre Lauzeral',
+    postalCode: '31400',
+    addressLocality: 'Toulouse',
+    addressCountry: 'FR',
+  },
+  contactPoint: [
+    {
+      '@type': 'ContactPoint',
+      contactType: 'customer support',
+      email: 'support@mergify.com',
+      url: `${site}/support/`,
+    },
+    {
+      '@type': 'ContactPoint',
+      contactType: 'sales',
+      email: 'sales@mergify.com',
+      url: 'https://mergify.com/pricing',
+    },
+  ],
+  // Identity profiles, for entity reconciliation. Deliberately not derived from
+  // `Footer/footer.ts`: that list is what we want people to click, and includes
+  // the Slack invite, which is a join link rather than a page that identifies
+  // Mergify. GitHub is spelled in the org's canonical casing here — both
+  // resolve, but `sameAs` is a claim about identity.
+  sameAs: [
+    'https://github.com/Mergifyio',
+    'https://twitter.com/mergifyio',
+    'https://www.linkedin.com/company/mergify/',
+    'https://www.youtube.com/@mergifyio',
+  ],
+};
+
+const softwareApplication = {
+  '@type': 'SoftwareApplication',
+  '@id': 'https://mergify.com/#software',
+  name: 'Mergify',
+  applicationCategory: 'DeveloperApplication',
+  applicationSubCategory: 'Continuous Integration',
+  operatingSystem: 'Web-based (SaaS)',
+  url: 'https://mergify.com/',
+  description:
+    'Merge queue, CI Insights, Test Insights, Merge Protections and stacked pull requests for teams developing on GitHub.',
+  publisher: { '@id': organization['@id'] },
+  offers: {
+    '@type': 'Offer',
+    url: 'https://mergify.com/pricing',
+    category: 'SaaS subscription',
+  },
+};
+
+const page = isHomepage
+  ? {
+      '@type': 'WebSite',
+      '@id': `${site}/#website`,
+      name: 'Mergify Documentation',
+      url: `${site}/`,
+      description: content.description,
+      inLanguage: 'en',
+      publisher: { '@id': organization['@id'] },
+      about: { '@id': softwareApplication['@id'] },
+    }
+  : {
+      '@type': 'TechArticle',
+      '@id': `${canonicalURL.href}#article`,
+      headline: content.title,
+      description: content.description,
+      url: canonicalURL.href,
+      inLanguage: 'en',
+      isPartOf: { '@id': `${site}/#website` },
+      publisher: { '@id': organization['@id'] },
+      about: { '@id': softwareApplication['@id'] },
+    };
+
+const graph = {
+  '@context': 'https://schema.org',
+  '@graph': [organization, softwareApplication, page],
+};
+
+// `JSON.stringify` does not escape `<`, so a page whose title or description
+// contained `</script>` would close this tag early and put the rest of the
+// frontmatter into the document as markup.
+const json = JSON.stringify(graph).replace(/</g, '\\u003c');
+---
+
+<script type="application/ld+json" is:inline set:html={json} />

src/content/docs/workflow/actions/merge.mdx

@@ -43,10 +43,14 @@ known incompatibilities, and how to configure bypass actors, see
 
 ## Pull Request Dependencies
 
-You can specify dependencies between pull requests from the same repository,
-or from other repositories with Mergify installed within your organization.
-Mergify waits for the linked pull requests to be merged before merging any pull
-request with a `Depends-On:` header.
+You can specify dependencies between pull requests from the same repository, or
+from another repository that has Mergify installed and belongs to the same
+repository owner, whether that owner is a user or an organization. Mergify waits
+for the linked pull requests to be merged before merging any pull request with a
+`Depends-On:` header. A reference Mergify cannot resolve blocks the merge rather
+than waiting on it, and it stays blocked until you fix the reference. That
+includes a reference pointing at another owner's repository, at a repository
+without Mergify, or at a pull request that does not exist.
 
 To use this feature, add the `Depends-On:` header to the body of your pull
 request:

src/layouts/BaseLayout.astro

@@ -9,6 +9,7 @@ import HeadSEO from '../components/HeadSEO.astro';
 import ImageZoom from '../components/ImageZoom.astro';
 import LeftSidebar from '../components/LeftSidebar/LeftSidebar.astro';
 import ScrollToTop from '../components/ScrollToTop.astro';
+import StructuredData from '../components/StructuredData.astro';
 import { getActivePageGroupIds } from '../util/activePageGroupIds';
 
 export interface Props {
@@ -36,6 +37,7 @@ const canonicalURL = new URL(Astro.url.pathname.replace(/([^/])$/, '$1/'), Astro
 	<head>
 		<HeadCommon activePageGroupIds={activePageGroupIds} />
 		<HeadSEO content={content} canonicalURL={canonicalURL} />
+		<StructuredData content={content} canonicalURL={canonicalURL} />
 		<title set:html={formatTitle(content)} />
 		<ClientRouter />
 		<style lang="scss">