repo sync

Author: Octomerger

.github/workflows/autoupdate-branch.yml

@@ -7,7 +7,7 @@ jobs:
   autoupdate:
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
     name: autoupdate
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: docker://chinthakagodawita/autoupdate-action:v1
         env:

.github/workflows/codeql.yml

@@ -2,9 +2,11 @@ name: CodeQL analysis
 
 on:
   push:
-    branches: main
+    branches:
+      - main
   pull_request:
-    branches: main
+    branches:
+      - main
     paths:
       - '**/*.js'
       - '.github/workflows/codeql.yml'

includes/liquid-tags/link-with-short-title.html

@@ -63,7 +63,6 @@ Note that link tags will only render links that are available in the current pag
 | `{% homepage_link_with_intro /href %}` | The linked page's title and intro, with homepage-specific styling.
 | `{% link_in_list /href %}` | The linked page's title in a list item.
 | `{% topic_link_in_list /href %}` | The linked map topic's title in a list item (used in category TOCs).
-| `{% link_with_short_title /href %}` | The linked page's title, where the title is pulled from the page's `shortTitle` frontmatter.
 | `{% indented_data_reference site.data.foo.bar spaces=NUMBER %}` | The data reference with the specified number of spaces prepended to each line.
 
 ## Creating tags

lib/liquid-tags/README.md

@@ -1,8 +1,4 @@
 const Link = require('./link')
 
 // For details, see class method in lib/liquid-tags/link.js
-module.exports = class HomepageLinkWithIntro extends Link {
-  async render (context) {
-    return super.parseTemplate(context)
-  }
-}
+module.exports = class HomepageLinkWithIntro extends Link {}

lib/liquid-tags/homepage-link-with-intro.js

@@ -1,8 +1,4 @@
 const Link = require('./link')
 
 // For details, see class method in lib/liquid-tags/link.js
-module.exports = class LinkInList extends Link {
-  async render (context) {
-    return super.parseTemplate(context)
-  }
-}
+module.exports = class LinkInList extends Link {}

lib/liquid-tags/link-in-list.js

@@ -1,8 +1,4 @@
 const Link = require('./link')
 
 // For details, see class method in lib/liquid-tags/link.js
-module.exports = class LinkWithIntro extends Link {
-  async render (context) {
-    return super.parseTemplate(context)
-  }
-}
+module.exports = class LinkWithIntro extends Link {}

lib/liquid-tags/link-with-intro.js

@@ -27,7 +27,7 @@ module.exports = class Link extends LiquidTag {
     super(template, tagName, href.trim())
   }
 
-  async parseTemplate (context, opts = { shortTitle: false }) {
+  async parseTemplate (context) {
     const template = await this.getTemplate()
 
     const ctx = context.environments[0]
@@ -64,9 +64,7 @@ module.exports = class Link extends LiquidTag {
     }
 
     // find and render the props
-    const title = opts.shortTitle
-      ? await page.renderProp('shortTitle', ctx, { textOnly: true, encodeEntities: true })
-      : await page.renderProp('title', ctx, { textOnly: true, encodeEntities: true })
+    const title = await page.renderProp('title', ctx, { textOnly: true, encodeEntities: true })
 
     // we want markdown in intros to be parsed, so we do not pass textOnly here
     const intro = await page.renderProp('intro', ctx, { unwrap: true })

lib/liquid-tags/link-with-short-title.js

@@ -1,8 +1,4 @@
 const Link = require('./link')
 
 // For details, see class method in lib/liquid-tags/link.js
-module.exports = class TopicLinkInList extends Link {
-  async render (context) {
-    return super.parseTemplate(context)
-  }
-}
+module.exports = class TopicLinkInList extends Link {}