Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 28 deletions

diff --git a/doc/.markdownlint/require_helper.js b/doc/.markdownlint/require_helper.js
deleted file mode 100644
index 7d06cf67419..00000000000
--- a/doc/.markdownlint/require_helper.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Look up the global node modules directory.
- *
- * Because we install markdownlint packages globally
- * in the Docker image where this runs, we need to
- * provide the path to the global install location
- * when referencing global functions from our own node
- * modules.
- *
- * Image:
- * https://gitlab.com/gitlab-org/gitlab-docs/-/blob/main/dockerfiles/gitlab-docs-lint-markdown.Dockerfile
- */
-const { execSync } = require('child_process');
-module.exports.globalPath = execSync('yarn global dir').toString().trim() + '/node_modules/';
diff --git a/doc/.markdownlint/rules/tabs_blank_lines.js b/doc/.markdownlint/rules/tabs_blank_lines.js
index e0e2c1a0a9b..8a9e9c2434e 100644
--- a/doc/.markdownlint/rules/tabs_blank_lines.js
+++ b/doc/.markdownlint/rules/tabs_blank_lines.js
@@ -1,9 +1,4 @@
-const { globalPath } = require('../require_helper');
-const {
-  forEachLine,
-  getLineMetadata,
-  isBlankLine,
-} = require(`${globalPath}/markdownlint-rule-helpers`);
+const { forEachLine, getLineMetadata, isBlankLine } = require(`markdownlint-rule-helpers`);
 
 module.exports = {
   names: ['tabs-blank-lines'],
diff --git a/doc/.markdownlint/rules/tabs_title_markup.js b/doc/.markdownlint/rules/tabs_title_markup.js
index 9c1de1e630d..0461ac8385f 100644
--- a/doc/.markdownlint/rules/tabs_title_markup.js
+++ b/doc/.markdownlint/rules/tabs_title_markup.js
@@ -1,5 +1,4 @@
-const { globalPath } = require('../require_helper');
-const { forEachLine, getLineMetadata } = require(`${globalPath}/markdownlint-rule-helpers`);
+const { forEachLine, getLineMetadata } = require(`markdownlint-rule-helpers`);
 
 module.exports = {
   names: ['tabs-title-markup'],
diff --git a/doc/.markdownlint/rules/tabs_title_text.js b/doc/.markdownlint/rules/tabs_title_text.js
index 672aa70f562..beb329231b1 100644
--- a/doc/.markdownlint/rules/tabs_title_text.js
+++ b/doc/.markdownlint/rules/tabs_title_text.js
@@ -1,9 +1,4 @@
-const { globalPath } = require('../require_helper');
-const {
-  forEachLine,
-  getLineMetadata,
-  isBlankLine,
-} = require(`${globalPath}/markdownlint-rule-helpers`);
+const { forEachLine, getLineMetadata, isBlankLine } = require(`markdownlint-rule-helpers`);
 
 module.exports = {
   names: ['tabs-title-text'],