From 85435943cd920f1cd97d65fd15f8907434f2aeea Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 28 Mar 2024 03:14:08 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/layout/line_length.yml          |   1 -
 .../components/suggestions_dropdown.vue       |  28 +-
 .../content_editor/extensions/link.js         |  11 +
 .../content_editor/extensions/suggestions.js  |  23 +-
 .../services/autocomplete_helper.js           |   2 +
 .../services/serialization_helpers.js         |  29 +-
 app/assets/javascripts/gfm_auto_complete.js   |  53 +++
 .../stylesheets/framework/typography.scss     |  19 +-
 .../autocomplete_sources_controller.rb        |   6 +-
 app/helpers/application_helper.rb             |   3 +-
 app/services/projects/autocomplete_service.rb |  12 +
 config/initializers/5_backend.rb              |  10 -
 config/routes/project.rb                      |   1 +
 doc/user/ai_features.md                       |   2 +-
 doc/user/markdown.md                          |  62 ++--
 doc/user/project/import/bitbucket_server.md   |   3 +-
 .../merge_requests/ai_in_merge_requests.md    |  63 ++--
 .../img/merge_request_ai_summary_v16_11.png   | Bin 0 -> 10607 bytes
 .../prosemirror_json.yml                      | 322 ++++++++++++++++++
 lib/banzai/filter/gollum_tags_filter.rb       |  59 ++--
 lib/banzai/pipeline/ascii_doc_pipeline.rb     |   1 +
 lib/banzai/pipeline/gfm_pipeline.rb           |   1 +
 lib/banzai/pipeline/wiki_pipeline.rb          |   3 +-
 .../reference_parser/wiki_page_parser.rb      |  35 ++
 lib/banzai/reference_redactor.rb              |   5 +-
 locale/gitlab.pot                             |   5 +-
 qa/Gemfile                                    |   2 +-
 qa/Gemfile.lock                               |   4 +-
 .../composer_registry_spec.rb                 |   2 +-
 .../autocomplete_sources_controller_spec.rb   |  38 +++
 spec/features/issues/gfm_autocomplete_spec.rb |  18 +
 .../components/suggestions_dropdown_spec.js   |  46 +++
 .../autocomplete_helper_spec.js.snap          |   7 +
 .../services/autocomplete_helper_spec.js      |   4 +
 .../services/autocomplete_mock_data.js        |  18 +
 .../services/markdown_serializer_spec.js      |  25 ++
 spec/frontend/gfm_auto_complete_spec.js       |  56 ++-
 spec/helpers/application_helper_spec.rb       |   2 +-
 .../banzai/filter/gollum_tags_filter_spec.rb  |  70 ++--
 .../reference_parser/wiki_page_parser_spec.rb |  57 ++++
 spec/lib/banzai/reference_redactor_spec.rb    |  12 +
 .../lib/glfm/update_example_snapshots_spec.rb |   6 +
 .../projects/autocomplete_service_spec.rb     |  33 ++
 .../autocomplete_shared_examples.rb           |  19 ++
 .../wiki/autocomplete_shared_examples.rb      |   5 +
 45 files changed, 1041 insertions(+), 142 deletions(-)
 delete mode 100644 config/initializers/5_backend.rb
 create mode 100644 doc/user/project/merge_requests/img/merge_request_ai_summary_v16_11.png
 create mode 100644 lib/banzai/reference_parser/wiki_page_parser.rb
 create mode 100644 spec/lib/banzai/reference_parser/wiki_page_parser_spec.rb

diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 1455784f258..82d436bb62a 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -630,7 +630,6 @@ Layout/LineLength:
     - 'config/application.rb'
     - 'config/initializers/01_secret_token.rb'
     - 'config/initializers/1_settings.rb'
-    - 'config/initializers/5_backend.rb'
     - 'config/initializers/7_prometheus_metrics.rb'
     - 'config/initializers/8_devise.rb'
     - 'config/initializers/active_record_force_reconnects.rb'
diff --git a/app/assets/javascripts/content_editor/components/suggestions_dropdown.vue b/app/assets/javascripts/content_editor/components/suggestions_dropdown.vue
index 92c533c4230..b34f83a5068 100644
--- a/app/assets/javascripts/content_editor/components/suggestions_dropdown.vue
+++ b/app/assets/javascripts/content_editor/components/suggestions_dropdown.vue
@@ -1,11 +1,12 @@
 <script>
-import { GlAvatar, GlLoadingIcon } from '@gitlab/ui';
+import { GlAvatar, GlLoadingIcon, GlIcon } from '@gitlab/ui';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 
 export default {
   components: {
     GlAvatar,
     GlLoadingIcon,
+    GlIcon,
   },
 
   directives: {
@@ -98,6 +99,10 @@ export default {
       return this.isReference && this.nodeProps.referenceType === 'milestone';
     },
 
+    isWiki() {
+      return this.nodeProps.referenceType === 'wiki';
+    },
+
     isEmoji() {
       return this.nodeType === 'emoji';
     },
@@ -146,6 +151,8 @@ export default {
           return item.reference;
         case 'vulnerability':
           return `[vulnerability:${item.id}]`;
+        case 'wiki':
+          return item.title;
         default:
           return '';
       }
@@ -178,6 +185,16 @@ export default {
         });
       }
 
+      if (this.isWiki) {
+        Object.assign(props, {
+          text: item.title,
+          href: item.path,
+          isGollumLink: true,
+          isWikiPage: true,
+          canonicalSrc: item.slug,
+        });
+      }
+
       Object.assign(props, this.nodeProps);
 
       return props;
@@ -312,6 +329,15 @@ export default {
                   <span v-safe-html:safeHtmlConfig="highlight(item.title)"></span>
                   <span v-if="item.expired">{{ __('(expired)') }}</span>
                 </span>
+                <span v-if="isWiki">
+                  <gl-icon class="gl-mr-2" name="document" />
+                  <span v-safe-html:[$options.safeHtmlConfig]="highlight(item.title)"></span>
+                  <small
+                    v-if="item.title.toLowerCase() !== item.slug.toLowerCase()"
+                    v-safe-html:[$options.safeHtmlConfig]="highlight(`(${item.slug})`)"
+                    class="gl-text-gray-500"
+                  ></small>
+                </span>
                 <span v-if="isLabel" class="gl-display-flex">
                   <span
                     data-testid="label-color-box"
diff --git a/app/assets/javascripts/content_editor/extensions/link.js b/app/assets/javascripts/content_editor/extensions/link.js
index 584e7b9e4f7..d70674f4f37 100644
--- a/app/assets/javascripts/content_editor/extensions/link.js
+++ b/app/assets/javascripts/content_editor/extensions/link.js
@@ -52,6 +52,17 @@ export default Link.extend({
         title: null,
         parseHTML: (element) => element.getAttribute('title'),
       },
+      // only for gollum links (wikis)
+      isGollumLink: {
+        default: false,
+        parseHTML: (element) => Boolean(element.dataset.gollum),
+        renderHTML: () => '',
+      },
+      isWikiPage: {
+        default: false,
+        parseHTML: (element) => Boolean(element.classList.contains('gfm-gollum-wiki-page')),
+        renderHTML: ({ isWikiPage }) => (isWikiPage ? { class: 'gfm-gollum-wiki-page' } : {}),
+      },
       canonicalSrc: {
         default: null,
         parseHTML: (element) => element.dataset.canonicalSrc,
diff --git a/app/assets/javascripts/content_editor/extensions/suggestions.js b/app/assets/javascripts/content_editor/extensions/suggestions.js
index d309210404a..20cc04f4af3 100644
--- a/app/assets/javascripts/content_editor/extensions/suggestions.js
+++ b/app/assets/javascripts/content_editor/extensions/suggestions.js
@@ -23,14 +23,24 @@ function createSuggestionPlugin({
     pluginKey: new PluginKey(uniqueId('suggestions')),
 
     command: ({ editor: tiptapEditor, range, props }) => {
-      tiptapEditor
-        .chain()
-        .focus()
-        .insertContentAt(range, [
+      let content;
+
+      if (nodeType === 'link') {
+        content = [
+          {
+            type: 'text',
+            text: props.text,
+            marks: [{ type: 'link', attrs: props }],
+          },
+        ];
+      } else {
+        content = [
           { type: nodeType, attrs: props },
           { type: 'text', text: ` ${insertionMap[props.text] || ''}` },
-        ])
-        .run();
+        ];
+      }
+
+      tiptapEditor.chain().focus().insertContentAt(range, content).run();
     },
 
     async items({ query, editor: tiptapEditor }) {
@@ -153,6 +163,7 @@ export default Node.create({
       createPlugin('[vulnerability:', 'reference', 'vulnerability'),
       createPlugin('%', 'reference', 'milestone'),
       createPlugin(':', 'emoji', 'emoji'),
+      createPlugin('[[', 'link', 'wiki'),
       createPlugin('/', 'reference', 'command', {
         cache: false,
         limit: 100,
diff --git a/app/assets/javascripts/content_editor/services/autocomplete_helper.js b/app/assets/javascripts/content_editor/services/autocomplete_helper.js
index 233367a5096..d6ce9ffb1c5 100644
--- a/app/assets/javascripts/content_editor/services/autocomplete_helper.js
+++ b/app/assets/javascripts/content_editor/services/autocomplete_helper.js
@@ -139,6 +139,7 @@ export default class AutocompleteHelper {
         merge_request: this.dataSourceUrls.mergeRequests,
         vulnerability: this.dataSourceUrls.vulnerabilities,
         command: this.dataSourceUrls.commands,
+        wiki: this.dataSourceUrls.wikis,
       };
 
       const searchFields = {
@@ -151,6 +152,7 @@ export default class AutocompleteHelper {
         merge_request: ['iid', 'title'],
         milestone: ['title', 'iid'],
         command: ['name'],
+        wiki: ['title'],
         emoji: [],
       };
 
diff --git a/app/assets/javascripts/content_editor/services/serialization_helpers.js b/app/assets/javascripts/content_editor/services/serialization_helpers.js
index f7b81392a89..bfcbbca8037 100644
--- a/app/assets/javascripts/content_editor/services/serialization_helpers.js
+++ b/app/assets/javascripts/content_editor/services/serialization_helpers.js
@@ -586,6 +586,10 @@ export const italic = {
   expelEnclosingWhitespace: true,
 };
 
+function getMarkText(mark, parent) {
+  return findChildWithMark(mark, parent).child?.text || '';
+}
+
 const generateCodeTag = (wrapTagName = openTag) => {
   const isOpen = wrapTagName === openTag;
 
@@ -596,7 +600,7 @@ const generateCodeTag = (wrapTagName = openTag) => {
       return wrapTagName(type.substring(1));
     }
 
-    const childText = findChildWithMark(mark, parent).child?.text || '';
+    const childText = getMarkText(mark, parent);
     if (childText.includes('`')) {
       let tag = '``';
       if (childText.startsWith('`') || childText.endsWith('`'))
@@ -694,12 +698,13 @@ export const link = {
       return isBracketAutoLink(mark.attrs.sourceMarkdown) ? '<' : '';
     }
 
-    const { href, title, sourceMarkdown } = mark.attrs;
+    const { href, title, sourceMarkdown, isGollumLink } = mark.attrs;
 
     // eslint-disable-next-line @gitlab/require-i18n-strings
     if (href.startsWith('data:') || href.startsWith('blob:')) return '';
 
     if (linkType(sourceMarkdown) === LINK_MARKDOWN) {
+      if (isGollumLink) return '[[';
       return '[';
     }
 
@@ -718,7 +723,14 @@ export const link = {
       return isBracketAutoLink(mark.attrs.sourceMarkdown) ? '>' : '';
     }
 
-    const { href = '', title, sourceMarkdown, isReference } = mark.attrs;
+    const {
+      href = '',
+      title,
+      sourceMarkdown,
+      isReference,
+      isGollumLink,
+      canonicalSrc,
+    } = mark.attrs;
 
     // eslint-disable-next-line @gitlab/require-i18n-strings
     if (href.startsWith('data:') || href.startsWith('blob:')) return '';
@@ -731,6 +743,17 @@ export const link = {
       return closeTag('a');
     }
 
+    if (isGollumLink) {
+      const text = getMarkText(mark, parent);
+      const escapedCanonicalSrc = state.esc(canonicalSrc);
+
+      if (text.toLowerCase() === escapedCanonicalSrc.toLowerCase()) {
+        return ']]';
+      }
+
+      return `|${escapedCanonicalSrc}]]`;
+    }
+
     return `](${state.esc(getLinkHref(mark, state.options.useCanonicalSrc))}${
       title ? ` ${state.quote(title)}` : ''
     })`;
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index 13ff4400c1f..28b2a41d11b 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -21,6 +21,7 @@ const MERGEREQUESTS_ALIAS = 'mergerequests';
 const LABELS_ALIAS = 'labels';
 const SNIPPETS_ALIAS = 'snippets';
 const CONTACTS_ALIAS = 'contacts';
+const WIKIS_ALIAS = 'wikis';
 
 const CADENCE_REFERENCE_PREFIX = '[cadence:';
 const ITERATION_REFERENCE_PREFIX = '*iteration:';
@@ -130,6 +131,7 @@ export const defaultAutocompleteConfig = {
   snippets: true,
   vulnerabilities: true,
   contacts: true,
+  wikis: true,
 };
 
 class GfmAutoComplete {
@@ -172,6 +174,7 @@ class GfmAutoComplete {
     if (this.enableMap.labels) this.setupLabels($input);
     if (this.enableMap.snippets) this.setupSnippets($input);
     if (this.enableMap.contacts) this.setupContacts($input);
+    if (this.enableMap.wikis) this.setupWikis($input);
 
     $input.filter('[data-supports-quick-actions="true"]').atwho({
       at: '/',
@@ -741,6 +744,47 @@ class GfmAutoComplete {
     showAndHideHelper($input, SNIPPETS_ALIAS);
   }
 
+  setupWikis($input) {
+    $input.atwho({
+      at: '[[',
+      suffix: ']]',
+      alias: WIKIS_ALIAS,
+      searchKey: 'title',
+      data: GfmAutoComplete.defaultLoadingData,
+      displayTpl(value) {
+        let tmpl = GfmAutoComplete.Loading.template;
+        if (value.title != null) {
+          tmpl = GfmAutoComplete.Wikis.templateFunction(value);
+        }
+        return tmpl;
+      },
+      // eslint-disable-next-line no-template-curly-in-string
+      insertTpl: '${atwho-at}${title}|${slug}',
+      callbacks: {
+        ...this.getDefaultCallbacks(),
+        beforeInsert(value) {
+          const [title, slug] = value.substr(2).split('|');
+          if (title.toLowerCase() === slug.toLowerCase()) {
+            return `[[${slug}`;
+          }
+          return `[[${title}|${slug}`;
+        },
+        beforeSave(wikis) {
+          return $.map(wikis, (m) => {
+            if (m.title == null) {
+              return m;
+            }
+            return {
+              title: m.title,
+              slug: m.slug,
+            };
+          });
+        },
+      },
+    });
+    showAndHideHelper($input, WIKIS_ALIAS);
+  }
+
   setupContacts($input) {
     const fetchData = this.fetchData.bind(this);
     let command = '';
@@ -1011,6 +1055,7 @@ GfmAutoComplete.atTypeMap = {
   '[vulnerability:': 'vulnerabilities',
   $: 'snippets',
   '[contact:': 'contacts',
+  '[[': 'wikis',
 };
 
 GfmAutoComplete.typesWithBackendFiltering = ['vulnerabilities'];
@@ -1116,6 +1161,14 @@ GfmAutoComplete.Contacts = {
     return `<li><small>${escape(firstName)} ${escape(lastName)}</small> ${escape(email)}</li>`;
   },
 };
+GfmAutoComplete.Wikis = {
+  templateFunction({ title, slug }) {
+    const icon = spriteIcon('document', 's16 vertical-align-middle gl-mr-2');
+    const slugSpan =
+      title.toLowerCase() !== slug.toLowerCase() ? ` <small>(${escape(slug)})</small>` : '';
+    return `<li>${icon} ${escape(title)} ${slugSpan}</li>`;
+  },
+};
 
 const loadingSpinner = loadingIconForLegacyJS({
   inline: true,
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index ca467f99c78..a8f5961e4c8 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -484,20 +484,29 @@
     }
   }
 
+  a.gfm-gollum-wiki-page {
+    &::before {
+      margin-right: 4px;
+      vertical-align: -2px;
+
+      @include gl-dark-invert-keep-hue;
+      content: url('sprite_icons/document.svg');
+    }
+  }
+
   a.with-attachment-icon,
   a[href*='/uploads/'],
   a[href*='storage.googleapis.com/google-code-attachments/'] {
     &::before {
       margin-right: 4px;
+      vertical-align: -2px;
 
-      font-style: normal;
-      font-size: inherit;
-      text-rendering: auto;
-      -webkit-font-smoothing: antialiased;
-      content: '📎';
+      @include gl-dark-invert-keep-hue;
+      content: url('sprite_icons/paperclip.svg');
     }
   }
 
+  a[href*='/wikis/'],
   a[href*='/uploads/'],
   a[href*='storage.googleapis.com/google-code-attachments/'] {
     &.no-attachment-icon {
diff --git a/app/controllers/projects/autocomplete_sources_controller.rb b/app/controllers/projects/autocomplete_sources_controller.rb
index c496a326051..cfc9a2fe342 100644
--- a/app/controllers/projects/autocomplete_sources_controller.rb
+++ b/app/controllers/projects/autocomplete_sources_controller.rb
@@ -6,7 +6,7 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
   before_action :authorize_read_milestone!, only: :milestones
   before_action :authorize_read_crm_contact!, only: :contacts
 
-  feature_category :team_planning, [:issues, :labels, :milestones, :commands, :contacts]
+  feature_category :team_planning, [:issues, :labels, :milestones, :commands, :contacts, :wikis]
   feature_category :code_review_workflow, [:merge_requests]
   feature_category :groups_and_projects, [:members]
   feature_category :source_code_management, [:snippets]
@@ -46,6 +46,10 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
     render json: autocomplete_service.contacts(target)
   end
 
+  def wikis
+    render json: autocomplete_service.wikis
+  end
+
   private
 
   def autocomplete_service
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2336dacc928..8685ea79812 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -456,7 +456,8 @@ module ApplicationHelper
         milestones: milestones_project_autocomplete_sources_path(object),
         commands: commands_project_autocomplete_sources_path(object, type: noteable_type, type_id: params[:id]),
         snippets: snippets_project_autocomplete_sources_path(object),
-        contacts: contacts_project_autocomplete_sources_path(object, type: noteable_type, type_id: params[:id])
+        contacts: contacts_project_autocomplete_sources_path(object, type: noteable_type, type_id: params[:id]),
+        wikis: object.feature_available?(:wiki, current_user) ? wikis_project_autocomplete_sources_path(object) : nil
       }
     end
   end
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb
index 8114044b019..9213866e609 100644
--- a/app/services/projects/autocomplete_service.rb
+++ b/app/services/projects/autocomplete_service.rb
@@ -3,6 +3,8 @@
 module Projects
   class AutocompleteService < BaseService
     include LabelsAsHash
+    include Routing::WikiHelper
+
     def issues
       IssuesFinder.new(current_user, project_id: project.id, state: 'opened').execute.select([:iid, :title])
     end
@@ -33,6 +35,16 @@ module Projects
       SnippetsFinder.new(current_user, project: project).execute.select([:id, :title])
     end
 
+    def wikis
+      wiki = Wiki.for_container(project, current_user)
+      return [] unless can?(current_user, :read_wiki, wiki.container)
+
+      wiki
+        .list_pages(limit: 5000)
+        .reject { |page| page.slug.start_with?('templates/') }
+        .map { |page| { path: wiki_page_path(page.wiki, page), slug: page.slug, title: page.title } }
+    end
+
     def contacts(target)
       available_contacts = Crm::ContactsFinder.new(current_user, group: project.group).execute
         .select([:id, :email, :first_name, :last_name, :state])
diff --git a/config/initializers/5_backend.rb b/config/initializers/5_backend.rb
deleted file mode 100644
index 78910bb7675..00000000000
--- a/config/initializers/5_backend.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-unless Rails.env.test?
-  required_version = Gitlab::VersionInfo.parse(Gitlab::Shell.version_required)
-  current_version = Gitlab::VersionInfo.parse(Gitlab::Shell.version)
-
-  unless current_version.valid? && required_version <= current_version
-    warn "WARNING: This version of GitLab depends on gitlab-shell #{required_version}, but you're running #{current_version}. Please update gitlab-shell."
-  end
-end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index c8d81535da8..487cbf65292 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -172,6 +172,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             get 'commands'
             get 'snippets'
             get 'contacts'
+            get 'wikis'
           end
         end
 
diff --git a/doc/user/ai_features.md b/doc/user/ai_features.md
index 94d32e66675..0c25c811250 100644
--- a/doc/user/ai_features.md
+++ b/doc/user/ai_features.md
@@ -26,7 +26,7 @@ Some features are still in development. View details about [support for each sta
 | Automates repetitive tasks and helps catch bugs early. | [Test generation](gitlab_duo_chat.md#write-tests-in-the-ide) | **Tier:** Ultimate <br>**Offering:** GitLab.com, Self-managed, GitLab Dedicated <br>**Status:** Beta |
 | Generates a description for the merge request based on the contents of the template. | [Merge request template population](project/merge_requests/ai_in_merge_requests.md#fill-in-merge-request-templates) | **Tier:** Ultimate<br>**Offering:** GitLab.com <br>**Status:** Experiment |
 | Assists in creating faster and higher-quality reviews by automatically suggesting reviewers for your merge request. <br><br><i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Watch overview](https://www.youtube.com/watch?v=ivwZQgh4Rxw) | [Suggested Reviewers](project/merge_requests/reviews/index.md#gitlab-duo-suggested-reviewers) | **Tier:** Ultimate <br>**Offering:** GitLab.com<br>**Status:** Generally Available  |
-| Efficiently communicates the impact of your merge request changes. | [Merge request summary](project/merge_requests/ai_in_merge_requests.md#summarize-merge-request-changes) | **Tier:** Ultimate <br>**Offering:** GitLab.com <br>**Status:** Experiment |
+| Efficiently communicates the impact of your merge request changes. | [Merge request summary](project/merge_requests/ai_in_merge_requests.md#summarize-merge-request-changes) | **Tier:** Ultimate <br>**Offering:** GitLab.com <br>**Status:** Beta |
 | Helps ease merge request handoff between authors and reviewers and help reviewers efficiently understand suggestions. | [Code review summary](project/merge_requests/ai_in_merge_requests.md#summarize-my-merge-request-review) | **Tier:** Ultimate <br>**Offering:** GitLab.com <br>**Status:** Experiment |
 | Helps you remediate vulnerabilities more efficiently, boost your skills, and write more secure code. <br><br><i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Watch overview](https://www.youtube.com/watch?v=6sDf73QOav8) | [Vulnerability explanation](application_security/vulnerabilities/index.md#explaining-a-vulnerability) | **Tier:** Ultimate <br>**Offering:** GitLab.com <br>**Status:** Beta |
 | Generates a merge request containing the changes required to mitigate a vulnerability. | [Vulnerability resolution](application_security/vulnerabilities/index.md#vulnerability-resolution) | **Tier:** Ultimate <br>**Offering:** GitLab.com <br>**Status:** Experiment |
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index ac7d9c64c02..9f3e7436e19 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -682,6 +682,8 @@ The selected diagram is replaced with an updated version.
 
 ## GitLab-specific references
 
+> - Autocomplete for wiki pages [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/442229) in GitLab 16.11.
+
 GitLab Flavored Markdown renders GitLab-specific references. For example, you can reference
 an issue, a commit, a team member, or even an entire project team. GitLab Flavored Markdown turns
 that reference into a link so you can navigate between them. All references to projects should use the
@@ -692,35 +694,37 @@ version to reference other projects from the same namespace.
 
 GitLab Flavored Markdown recognizes the following:
 
-| References                                                     | Input                          | Cross-project reference                 | Shortcut inside the same namespace |
-| -------------------------------------------------------------- | ------------------------------ | --------------------------------------- | ---------------------------------- |
-| Specific user                                                  | `@user_name`                   |                                         |                                    |
-| Specific group                                                 | `@group_name`                  |                                         |                                    |
-| Entire team                                                    | [`@all`](discussions/index.md#mentioning-all-members) |                  |                                    |
-| Project                                                        | `namespace/project>`           |                                         |                                    |
-| Issue                                                          | ``#123``                       | `namespace/project#123`                 | `project#123`                      |
-| Merge request                                                  | `!123`                         | `namespace/project!123`                 | `project!123`                      |
-| Snippet                                                        | `$123`                         | `namespace/project$123`                 | `project$123`                      |
-| [Epic](group/epics/index.md)                                   | `&123`                         | `group1/subgroup&123`                   |                                    |
-| [Iteration](group/iterations/index.md)                         | `*iteration:"iteration title"` |                                         |                                    |
-| [Iteration cadence](group/iterations/index.md) by ID<sup>1</sup>                     | `[cadence:123]`      |                             |                                    |
-| [Iteration cadence](group/iterations/index.md) by title (one word)<sup>1</sup>       | `[cadence:plan]`     |                             |                                    |
-| [Iteration cadence](group/iterations/index.md) by title (multiple words)<sup>1</sup> | `[cadence:"plan a"]` |                             |                                    |
-| [Vulnerability](application_security/vulnerabilities/index.md) | `[vulnerability:123]`          | `[vulnerability:namespace/project/123]` | `[vulnerability:project/123]`      |
-| Feature flag                                                   | `[feature_flag:123]`           | `[feature_flag:namespace/project/123]`  | `[feature_flag:project/123]`       |
-| Label by ID                                                    | `~123`                         | `namespace/project~123`                 | `project~123`                      |
-| Label by name (one word)                                       | `~bug`                         | `namespace/project~bug`                 | `project~bug`                      |
-| Label by name (multiple words)                                 | `~"feature request"`           | `namespace/project~"feature request"`   | `project~"feature request"`        |
-| Label by name (scoped)                                         | `~"priority::high"`            | `namespace/project~"priority::high"`    | `project~"priority::high"`         |
-| Project milestone by ID <sup>2</sup> | `%123`                         | `namespace/project%123`                 | `project%123`                      |
-| Milestone by name (one word) <sup>2</sup> | `%v1.23`                       | `namespace/project%v1.23`               | `project%v1.23`                    |
-| Milestone by name (multiple words) <sup>2</sup> | `%"release candidate"`         | `namespace/project%"release candidate"` | `project%"release candidate"`      |
-| Commit (specific)                                              | `9ba12248`                     | `namespace/project@9ba12248`            | `project@9ba12248`                 |
-| Commit range comparison                                        | `9ba12248...b19a04f5`          | `namespace/project@9ba12248...b19a04f5` | `project@9ba12248...b19a04f5`      |
-| Repository file reference                                      | `[README](doc/README.md)`      |                                         |                                    |
-| Repository file reference (specific line)                      | `[README](doc/README.md#L13)`  |                                         |                                    |
-| [Alert](../operations/incident_management/alerts.md)           | `^alert#123`                   | `namespace/project^alert#123`           | `project^alert#123`                |
-| [Contact](crm/index.md#contacts)                               | `[contact:test@example.com]`   |                                         |                                    |
+| References                                                                           | Input                                                 | Cross-project reference                 | Shortcut inside the same namespace |
+|--------------------------------------------------------------------------------------|-------------------------------------------------------|-----------------------------------------|------------------------------------|
+| Specific user                                                                        | `@user_name`                                          |                                         |                                    |
+| Specific group                                                                       | `@group_name`                                         |                                         |                                    |
+| Entire team                                                                          | [`@all`](discussions/index.md#mentioning-all-members) |                                         |                                    |
+| Project                                                                              | `namespace/project>`                                  |                                         |                                    |
+| Issue                                                                                | ``#123``                                              | `namespace/project#123`                 | `project#123`                      |
+| Merge request                                                                        | `!123`                                                | `namespace/project!123`                 | `project!123`                      |
+| Snippet                                                                              | `$123`                                                | `namespace/project$123`                 | `project$123`                      |
+| [Epic](group/epics/index.md)                                                         | `&123`                                                | `group1/subgroup&123`                   |                                    |
+| [Iteration](group/iterations/index.md)                                               | `*iteration:"iteration title"`                        |                                         |                                    |
+| [Iteration cadence](group/iterations/index.md) by ID<sup>1</sup>                     | `[cadence:123]`                                       |                                         |                                    |
+| [Iteration cadence](group/iterations/index.md) by title (one word)<sup>1</sup>       | `[cadence:plan]`                                      |                                         |                                    |
+| [Iteration cadence](group/iterations/index.md) by title (multiple words)<sup>1</sup> | `[cadence:"plan a"]`                                  |                                         |                                    |
+| [Vulnerability](application_security/vulnerabilities/index.md)                       | `[vulnerability:123]`                                 | `[vulnerability:namespace/project/123]` | `[vulnerability:project/123]`      |
+| Feature flag                                                                         | `[feature_flag:123]`                                  | `[feature_flag:namespace/project/123]`  | `[feature_flag:project/123]`       |
+| Label by ID                                                                          | `~123`                                                | `namespace/project~123`                 | `project~123`                      |
+| Label by name (one word)                                                             | `~bug`                                                | `namespace/project~bug`                 | `project~bug`                      |
+| Label by name (multiple words)                                                       | `~"feature request"`                                  | `namespace/project~"feature request"`   | `project~"feature request"`        |
+| Label by name (scoped)                                                               | `~"priority::high"`                                   | `namespace/project~"priority::high"`    | `project~"priority::high"`         |
+| Project milestone by ID <sup>2</sup>                                                 | `%123`                                                | `namespace/project%123`                 | `project%123`                      |
+| Milestone by name (one word) <sup>2</sup>                                            | `%v1.23`                                              | `namespace/project%v1.23`               | `project%v1.23`                    |
+| Milestone by name (multiple words) <sup>2</sup>                                      | `%"release candidate"`                                | `namespace/project%"release candidate"` | `project%"release candidate"`      |
+| Commit (specific)                                                                    | `9ba12248`                                            | `namespace/project@9ba12248`            | `project@9ba12248`                 |
+| Commit range comparison                                                              | `9ba12248...b19a04f5`                                 | `namespace/project@9ba12248...b19a04f5` | `project@9ba12248...b19a04f5`      |
+| Repository file reference                                                            | `[README](doc/README.md)`                             |                                         |                                    |
+| Repository file reference (specific line)                                            | `[README](doc/README.md#L13)`                         |                                         |                                    |
+| [Alert](../operations/incident_management/alerts.md)                                 | `^alert#123`                                          | `namespace/project^alert#123`           | `project^alert#123`                |
+| [Contact](crm/index.md#contacts)                                                     | `[contact:test@example.com]`                          |                                         |                                    |
+| [Wiki page](project/wiki/index.md) (if the page slug is the same as the title)        | `[[Home]]`                                            |                                         |                                    |
+| [Wiki page](project/wiki/index.md) (if the page slug is different from the title)     | `[[How to use GitLab\|how-to-use-gitlab]]`            |                                         |                                    |
 
 **Footnotes:**
 
diff --git a/doc/user/project/import/bitbucket_server.md b/doc/user/project/import/bitbucket_server.md
index f64f31eef41..be25cba5582 100644
--- a/doc/user/project/import/bitbucket_server.md
+++ b/doc/user/project/import/bitbucket_server.md
@@ -27,7 +27,8 @@ This process is different than [importing from Bitbucket Cloud](bitbucket.md).
   must be enabled. If not enabled, ask your GitLab administrator to enable it. The Bitbucket Server import source is enabled
   by default on GitLab.com.
 - At least the Maintainer role on the destination group to import to.
-- Bitbucket Server authentication token with administrator access.
+- Bitbucket Server authentication token with administrator access. Without administrator access, some data is
+  [not imported](https://gitlab.com/gitlab-org/gitlab/-/issues/446218).
 
 ## Import repositories
 
diff --git a/doc/user/project/merge_requests/ai_in_merge_requests.md b/doc/user/project/merge_requests/ai_in_merge_requests.md
index a944dd96f08..495d5f4fb7f 100644
--- a/doc/user/project/merge_requests/ai_in_merge_requests.md
+++ b/doc/user/project/merge_requests/ai_in_merge_requests.md
@@ -15,45 +15,17 @@ AI-assisted features in merge requests are designed to provide contextually rele
 
 Additional information on enabling these features and maturity can be found in our [GitLab Duo overview](../../ai_features.md).
 
-## Fill in merge request templates
-
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10591) in GitLab 16.3 as an [Experiment](../../../policy/experiment-beta-support.md#experiment).
-
-This feature is an [Experiment](../../../policy/experiment-beta-support.md) on GitLab.com.
-
-Merge requests in projects often have [templates](../description_templates.md#create-a-merge-request-template) defined that need to be filled out. This helps reviewers and other users understand the purpose and changes a merge request might propose.
-
-When creating a merge request, GitLab Duo can generate a description for the merge request based on the contents of the template. This fills in the template and replaces the current contents of the description.
-
-To generate the description:
-
-1. [Create a new merge request](creating_merge_requests.md), and go to the **Description** field.
-1. Select **AI Actions** (**{tanuki}**).
-1. Select **Fill in merge request template**.
-
-The updated description is applied to the box. You can edit or revise this description before you finish creating your merge request.
-
-Provide feedback on this experimental feature in [issue 416537](https://gitlab.com/gitlab-org/gitlab/-/issues/416537).
-
-**Data usage**: When you use this feature, the following data is sent to the large language model referenced above:
-
-- Title of the merge request
-- Contents of the description
-- Diff of changes between the source branch's head and the target branch
-
 ## Summarize merge request changes
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10401) in GitLab 16.2 as an [Experiment](../../../policy/experiment-beta-support.md#experiment).
 
-This feature is an [Experiment](../../../policy/experiment-beta-support.md) on GitLab.com.
+This feature is in [Beta](../../../policy/experiment-beta-support.md) on GitLab.com.
 
-GitLab Duo Merge request summaries are available on the merge request page in:
+GitLab Duo Merge request summaries can be added to your merge request description when creating or editing a merge request. To add a summary, select **Summarize code changes**. The generated summary is added to the merge request description where your cursor is.
 
-- The **Merge request summaries** dialog.
-- The To-Do list.
-- Email notifications.
+![merge_request_ai_summary_v16_11](img/merge_request_ai_summary_v16_11.png)
 
-Provide feedback on this experimental feature in [issue 408726](https://gitlab.com/gitlab-org/gitlab/-/issues/408726).
+Provide feedback on this feature in [issue 443236](https://gitlab.com/gitlab-org/gitlab/-/issues/443236).
 
 **Data usage**: The diff of changes between the source branch's head and the target branch is sent to the large language model.
 
@@ -80,6 +52,33 @@ Provide feedback on this experimental feature in [issue 408991](https://gitlab.c
 
 - Draft comment's text
 
+## Fill in merge request templates
+
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10591) in GitLab 16.3 as an [Experiment](../../../policy/experiment-beta-support.md#experiment).
+> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/429882) to Beta in GitLab 16.10
+
+This feature is in [Beta](../../../policy/experiment-beta-support.md) on GitLab.com.
+
+Merge requests in projects often have [templates](../description_templates.md#create-a-merge-request-template) defined that need to be filled out. This helps reviewers and other users understand the purpose and changes a merge request might propose.
+
+When creating a merge request, GitLab Duo can generate a description for the merge request based on the contents of the template. This fills in the template and replaces the current contents of the description.
+
+To generate the description:
+
+1. [Create a new merge request](creating_merge_requests.md), and go to the **Description** field.
+1. Select **AI Actions** (**{tanuki}**).
+1. Select **Fill in merge request template**.
+
+The updated description is applied to the box. You can edit or revise this description before you finish creating your merge request.
+
+Provide feedback on this experimental feature in [issue 416537](https://gitlab.com/gitlab-org/gitlab/-/issues/416537).
+
+**Data usage**: When you use this feature, the following data is sent to the large language model referenced above:
+
+- Title of the merge request
+- Contents of the description
+- Diff of changes between the source branch's head and the target branch
+
 ## Generate messages for merge or squash commits
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10453) in GitLab 16.2 as an [Experiment](../../../policy/experiment-beta-support.md#experiment).
diff --git a/doc/user/project/merge_requests/img/merge_request_ai_summary_v16_11.png b/doc/user/project/merge_requests/img/merge_request_ai_summary_v16_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..b30734eb5b5024b2570926b18acbe138d1ea1313
GIT binary patch
literal 10607
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

literal 0
HcmV?d00001

diff --git a/glfm_specification/output_example_snapshots/prosemirror_json.yml b/glfm_specification/output_example_snapshots/prosemirror_json.yml
index 34b8118cd78..05163b2cc39 100644
--- a/glfm_specification/output_example_snapshots/prosemirror_json.yml
+++ b/glfm_specification/output_example_snapshots/prosemirror_json.yml
@@ -3200,6 +3200,8 @@
                       "uploading": false,
                       "href": "bar",
                       "title": null,
+                      "isGollumLink": false,
+                      "isWikiPage": false,
                       "canonicalSrc": "bar",
                       "isReference": false
                     }
@@ -3286,6 +3288,8 @@
                   "uploading": false,
                   "href": "foo",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": false
                 }
@@ -3815,6 +3819,8 @@
                   "uploading": false,
                   "href": "bar",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar",
                   "isReference": false
                 }
@@ -3975,6 +3981,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4016,6 +4024,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "the title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4057,6 +4067,8 @@
                   "uploading": false,
                   "href": "my_(url)",
                   "title": "title (with parens)",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo*bar\\]",
                   "isReference": true
                 }
@@ -4098,6 +4110,8 @@
                   "uploading": false,
                   "href": "my%20url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo bar",
                   "isReference": true
                 }
@@ -4139,6 +4153,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "\ntitle\nline1\nline2\n",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4213,6 +4229,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4278,6 +4296,8 @@
                   "uploading": false,
                   "href": "",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4343,6 +4363,8 @@
                   "uploading": false,
                   "href": "/url%5Cbar*baz",
                   "title": "foo\"bar\\baz",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4370,6 +4392,8 @@
                   "uploading": false,
                   "href": "url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4411,6 +4435,8 @@
                   "uploading": false,
                   "href": "first",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4480,6 +4506,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4521,6 +4549,8 @@
                   "uploading": false,
                   "href": "/%CF%86%CE%BF%CF%85",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "αγω",
                   "isReference": true
                 }
@@ -4726,6 +4756,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4810,6 +4842,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4855,6 +4889,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4924,6 +4960,8 @@
                   "uploading": false,
                   "href": "/foo-url",
                   "title": "foo",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -4944,6 +4982,8 @@
                   "uploading": false,
                   "href": "/bar-url",
                   "title": "bar",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar",
                   "isReference": true
                 }
@@ -4964,6 +5004,8 @@
                   "uploading": false,
                   "href": "/baz-url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "baz",
                   "isReference": true
                 }
@@ -4991,6 +5033,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -10817,6 +10861,8 @@
                   "uploading": false,
                   "href": "http://example.com?find=%5C*",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://example.com?find=%5C*",
                   "isReference": false
                 }
@@ -10853,6 +10899,8 @@
                   "uploading": false,
                   "href": "/bar*",
                   "title": "ti*tle",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/bar*",
                   "isReference": false
                 }
@@ -10880,6 +10928,8 @@
                   "uploading": false,
                   "href": "/bar*",
                   "title": "ti*tle",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -11040,6 +11090,8 @@
                   "uploading": false,
                   "href": "/f%C3%B6%C3%B6",
                   "title": "föö",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/f%C3%B6%C3%B6",
                   "isReference": false
                 }
@@ -11067,6 +11119,8 @@
                   "uploading": false,
                   "href": "/f%C3%B6%C3%B6",
                   "title": "föö",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -11603,6 +11657,8 @@
                   "uploading": false,
                   "href": "`",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "`",
                   "isReference": false
                 }
@@ -11654,6 +11710,8 @@
                   "uploading": false,
                   "href": "http://foo.bar.%60baz",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://foo.bar.%60baz",
                   "isReference": false
                 }
@@ -12810,6 +12868,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -13280,6 +13340,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -13349,6 +13411,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -13708,6 +13772,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -14614,6 +14680,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -14645,6 +14713,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -14798,6 +14868,8 @@
                   "uploading": false,
                   "href": "http://foo.bar/?q=**",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://foo.bar/?q=**",
                   "isReference": false
                 }
@@ -14829,6 +14901,8 @@
                   "uploading": false,
                   "href": "http://foo.bar/?q=__",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://foo.bar/?q=__",
                   "isReference": false
                 }
@@ -14907,6 +14981,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -14934,6 +15010,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -14961,6 +15039,8 @@
                   "uploading": false,
                   "href": "",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "",
                   "isReference": false
                 }
@@ -14988,6 +15068,8 @@
                   "uploading": false,
                   "href": "",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "",
                   "isReference": false
                 }
@@ -15030,6 +15112,8 @@
                   "uploading": false,
                   "href": "/my%20uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/my%20uri",
                   "isReference": false
                 }
@@ -15087,6 +15171,8 @@
                   "uploading": false,
                   "href": "b)c",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "b)c",
                   "isReference": false
                 }
@@ -15153,6 +15239,8 @@
                   "uploading": false,
                   "href": "(foo)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "(foo)",
                   "isReference": false
                 }
@@ -15180,6 +15268,8 @@
                   "uploading": false,
                   "href": "foo(and(bar))",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo(and(bar))",
                   "isReference": false
                 }
@@ -15207,6 +15297,8 @@
                   "uploading": false,
                   "href": "foo(and(bar)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo(and(bar)",
                   "isReference": false
                 }
@@ -15234,6 +15326,8 @@
                   "uploading": false,
                   "href": "foo(and(bar)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo(and(bar)",
                   "isReference": false
                 }
@@ -15261,6 +15355,8 @@
                   "uploading": false,
                   "href": "foo):",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo):",
                   "isReference": false
                 }
@@ -15288,6 +15384,8 @@
                   "uploading": false,
                   "href": "#fragment",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "#fragment",
                   "isReference": false
                 }
@@ -15309,6 +15407,8 @@
                   "uploading": false,
                   "href": "http://example.com#fragment",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://example.com#fragment",
                   "isReference": false
                 }
@@ -15330,6 +15430,8 @@
                   "uploading": false,
                   "href": "http://example.com?foo=3#frag",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://example.com?foo=3#frag",
                   "isReference": false
                 }
@@ -15357,6 +15459,8 @@
                   "uploading": false,
                   "href": "foo%5Cbar",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo%5Cbar",
                   "isReference": false
                 }
@@ -15384,6 +15488,8 @@
                   "uploading": false,
                   "href": "foo%20b%C3%A4",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo%20b%C3%A4",
                   "isReference": false
                 }
@@ -15411,6 +15517,8 @@
                   "uploading": false,
                   "href": "%22title%22",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "%22title%22",
                   "isReference": false
                 }
@@ -15438,6 +15546,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -15465,6 +15575,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title \"\"",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -15492,6 +15604,8 @@
                   "uploading": false,
                   "href": "/url%C2%A0%22title%22",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url%C2%A0%22title%22",
                   "isReference": false
                 }
@@ -15534,6 +15648,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title \"and\" title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/url",
                   "isReference": false
                 }
@@ -15561,6 +15677,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15603,6 +15721,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15649,6 +15769,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15676,6 +15798,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15703,6 +15827,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15719,6 +15845,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15738,6 +15866,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15760,6 +15890,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15806,6 +15938,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15836,6 +15970,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15880,6 +16016,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15951,6 +16089,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -15978,6 +16118,8 @@
                   "uploading": false,
                   "href": "baz*",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "baz*",
                   "isReference": false
                 }
@@ -16072,6 +16214,8 @@
                   "uploading": false,
                   "href": "http://example.com/?search=%5D(uri)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://example.com/?search=%5D(uri)",
                   "isReference": false
                 }
@@ -16099,6 +16243,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar",
                   "isReference": true
                 }
@@ -16140,6 +16286,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16181,6 +16329,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16222,6 +16372,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16238,6 +16390,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16257,6 +16411,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16279,6 +16435,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16339,6 +16497,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16383,6 +16543,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uri",
                   "isReference": false
                 }
@@ -16403,6 +16565,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16457,6 +16621,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16480,6 +16646,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16525,6 +16693,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16566,6 +16736,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref",
                   "isReference": true
                 }
@@ -16678,6 +16850,8 @@
                   "uploading": false,
                   "href": "http://example.com/?search=%5D%5Bref%5D",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://example.com/?search=%5D%5Bref%5D",
                   "isReference": false
                 }
@@ -16719,6 +16893,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar",
                   "isReference": true
                 }
@@ -16760,6 +16936,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "толпой",
                   "isReference": true
                 }
@@ -16819,6 +16997,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo bar",
                   "isReference": true
                 }
@@ -16850,6 +17030,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar",
                   "isReference": true
                 }
@@ -16895,6 +17077,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar",
                   "isReference": true
                 }
@@ -16964,6 +17148,8 @@
                   "uploading": false,
                   "href": "/url1",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17092,6 +17278,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "ref\\[",
                   "isReference": true
                 }
@@ -17147,6 +17335,8 @@
                   "uploading": false,
                   "href": "/uri",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar\\\\",
                   "isReference": true
                 }
@@ -17222,6 +17412,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17263,6 +17455,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "*foo* bar",
                   "isReference": true
                 }
@@ -17282,6 +17476,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "*foo* bar",
                   "isReference": true
                 }
@@ -17323,6 +17519,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17364,6 +17562,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17409,6 +17609,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17450,6 +17652,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "*foo* bar",
                   "isReference": true
                 }
@@ -17469,6 +17673,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "*foo* bar",
                   "isReference": true
                 }
@@ -17514,6 +17720,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "*foo* bar",
                   "isReference": true
                 }
@@ -17533,6 +17741,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "*foo* bar",
                   "isReference": true
                 }
@@ -17582,6 +17792,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17623,6 +17835,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17664,6 +17878,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17756,6 +17972,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo*",
                   "isReference": true
                 }
@@ -17783,6 +18001,8 @@
                   "uploading": false,
                   "href": "/url2",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar",
                   "isReference": true
                 }
@@ -17838,6 +18058,8 @@
                   "uploading": false,
                   "href": "/url1",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17879,6 +18101,8 @@
                   "uploading": false,
                   "href": "",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "",
                   "isReference": false
                 }
@@ -17920,6 +18144,8 @@
                   "uploading": false,
                   "href": "/url1",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -17969,6 +18195,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "baz",
                   "isReference": true
                 }
@@ -18010,6 +18238,8 @@
                   "uploading": false,
                   "href": "/url2",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "bar",
                   "isReference": true
                 }
@@ -18026,6 +18256,8 @@
                   "uploading": false,
                   "href": "/url1",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "baz",
                   "isReference": true
                 }
@@ -18085,6 +18317,8 @@
                   "uploading": false,
                   "href": "/url1",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "baz",
                   "isReference": true
                 }
@@ -18829,6 +19063,8 @@
                   "uploading": false,
                   "href": "/url",
                   "title": "title",
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "foo",
                   "isReference": true
                 }
@@ -18870,6 +19106,8 @@
                   "uploading": false,
                   "href": "http://foo.bar.baz",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://foo.bar.baz",
                   "isReference": false
                 }
@@ -18897,6 +19135,8 @@
                   "uploading": false,
                   "href": "http://foo.bar.baz/test?q=hello&id=22&boolean",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://foo.bar.baz/test?q=hello&id=22&boolean",
                   "isReference": false
                 }
@@ -18924,6 +19164,8 @@
                   "uploading": false,
                   "href": null,
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": null,
                   "isReference": false
                 }
@@ -18951,6 +19193,8 @@
                   "uploading": false,
                   "href": "MAILTO:FOO@BAR.BAZ",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "MAILTO:FOO@BAR.BAZ",
                   "isReference": false
                 }
@@ -18978,6 +19222,8 @@
                   "uploading": false,
                   "href": null,
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": null,
                   "isReference": false
                 }
@@ -19005,6 +19251,8 @@
                   "uploading": false,
                   "href": null,
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": null,
                   "isReference": false
                 }
@@ -19032,6 +19280,8 @@
                   "uploading": false,
                   "href": "http://../",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://../",
                   "isReference": false
                 }
@@ -19059,6 +19309,8 @@
                   "uploading": false,
                   "href": null,
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": null,
                   "isReference": false
                 }
@@ -19090,6 +19342,8 @@
                   "uploading": false,
                   "href": "http://foo.bar/baz",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://foo.bar/baz",
                   "isReference": false
                 }
@@ -19121,6 +19375,8 @@
                   "uploading": false,
                   "href": "http://example.com/%5C%5B%5C",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://example.com/%5C%5B%5C",
                   "isReference": false
                 }
@@ -19148,6 +19404,8 @@
                   "uploading": false,
                   "href": "mailto:foo@bar.example.com",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "mailto:foo@bar.example.com",
                   "isReference": false
                 }
@@ -19175,6 +19433,8 @@
                   "uploading": false,
                   "href": "mailto:foo+special@Bar.baz-bar0.com",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "mailto:foo+special@Bar.baz-bar0.com",
                   "isReference": false
                 }
@@ -19206,6 +19466,8 @@
                   "uploading": false,
                   "href": "mailto:foo+@bar.example.com",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "mailto:foo+@bar.example.com",
                   "isReference": false
                 }
@@ -19256,6 +19518,8 @@
                   "uploading": false,
                   "href": "http://foo.bar",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://foo.bar",
                   "isReference": false
                 }
@@ -19317,6 +19581,8 @@
                   "uploading": false,
                   "href": "http://example.com",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://example.com",
                   "isReference": false
                 }
@@ -19344,6 +19610,8 @@
                   "uploading": false,
                   "href": "mailto:foo@bar.example.com",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "mailto:foo@bar.example.com",
                   "isReference": false
                 }
@@ -19371,6 +19639,8 @@
                   "uploading": false,
                   "href": "http://www.commonmark.org",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.commonmark.org",
                   "isReference": false
                 }
@@ -19402,6 +19672,8 @@
                   "uploading": false,
                   "href": "http://www.commonmark.org/help",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.commonmark.org/help",
                   "isReference": false
                 }
@@ -19437,6 +19709,8 @@
                   "uploading": false,
                   "href": "http://www.commonmark.org",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.commonmark.org",
                   "isReference": false
                 }
@@ -19466,6 +19740,8 @@
                   "uploading": false,
                   "href": "http://www.commonmark.org/a.b",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.commonmark.org/a.b",
                   "isReference": false
                 }
@@ -19497,6 +19773,8 @@
                   "uploading": false,
                   "href": "http://www.google.com/search?q=Markup+(business)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.google.com/search?q=Markup+(business)",
                   "isReference": false
                 }
@@ -19518,6 +19796,8 @@
                   "uploading": false,
                   "href": "http://www.google.com/search?q=Markup+(business)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.google.com/search?q=Markup+(business)",
                   "isReference": false
                 }
@@ -19547,6 +19827,8 @@
                   "uploading": false,
                   "href": "http://www.google.com/search?q=Markup+(business)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.google.com/search?q=Markup+(business)",
                   "isReference": false
                 }
@@ -19576,6 +19858,8 @@
                   "uploading": false,
                   "href": "http://www.google.com/search?q=Markup+(business)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.google.com/search?q=Markup+(business)",
                   "isReference": false
                 }
@@ -19603,6 +19887,8 @@
                   "uploading": false,
                   "href": "http://www.google.com/search?q=(business))+ok",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.google.com/search?q=(business))+ok",
                   "isReference": false
                 }
@@ -19630,6 +19916,8 @@
                   "uploading": false,
                   "href": "http://www.google.com/search?q=commonmark&hl=en",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.google.com/search?q=commonmark&hl=en",
                   "isReference": false
                 }
@@ -19651,6 +19939,8 @@
                   "uploading": false,
                   "href": "http://www.google.com/search?q=commonmark",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.google.com/search?q=commonmark",
                   "isReference": false
                 }
@@ -19682,6 +19972,8 @@
                   "uploading": false,
                   "href": "http://www.commonmark.org/he",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.commonmark.org/he",
                   "isReference": false
                 }
@@ -19713,6 +20005,8 @@
                   "uploading": false,
                   "href": "http://commonmark.org",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://commonmark.org",
                   "isReference": false
                 }
@@ -19738,6 +20032,8 @@
                   "uploading": false,
                   "href": "https://encrypted.google.com/search?q=Markup+(business)",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "https://encrypted.google.com/search?q=Markup+(business)",
                   "isReference": false
                 }
@@ -19778,6 +20074,8 @@
                   "uploading": false,
                   "href": "mailto:foo@bar.baz",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "mailto:foo@bar.baz",
                   "isReference": false
                 }
@@ -19809,6 +20107,8 @@
                   "uploading": false,
                   "href": "mailto:hello+xyz@mail.example",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "mailto:hello+xyz@mail.example",
                   "isReference": false
                 }
@@ -19840,6 +20140,8 @@
                   "uploading": false,
                   "href": "mailto:a.b-c_d@a.b",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "mailto:a.b-c_d@a.b",
                   "isReference": false
                 }
@@ -19861,6 +20163,8 @@
                   "uploading": false,
                   "href": "mailto:a.b-c_d@a.b",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "mailto:a.b-c_d@a.b",
                   "isReference": false
                 }
@@ -21095,6 +21399,8 @@
                   "uploading": false,
                   "href": "/uploads/aa45a38ec2cfe97433281b10bbff042c/test-file.zip",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uploads/aa45a38ec2cfe97433281b10bbff042c/test-file.zip",
                   "isReference": false
                 }
@@ -21122,6 +21428,8 @@
                   "uploading": false,
                   "href": "/uploads/aa45a38ec2cfe97433281b10bbff042c/test-file.zip",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "/uploads/aa45a38ec2cfe97433281b10bbff042c/test-file.zip",
                   "isReference": false
                 }
@@ -21177,6 +21485,8 @@
                   "uploading": false,
                   "href": "test-file.zip",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "test-file.zip",
                   "isReference": false
                 }
@@ -22867,6 +23177,8 @@
                   "uploading": false,
                   "href": "https://gitlab.com",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "https://gitlab.com",
                   "isReference": false
                 }
@@ -23787,6 +24099,8 @@
                   "uploading": false,
                   "href": "http://www.google.com",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://www.google.com",
                   "isReference": false
                 }
@@ -23814,6 +24128,8 @@
                   "uploading": false,
                   "href": "http://google.com",
                   "title": null,
+                  "isGollumLink": false,
+                  "isWikiPage": false,
                   "canonicalSrc": "http://google.com",
                   "isReference": false
                 }
@@ -23910,6 +24226,8 @@
                               "uploading": false,
                               "href": "https://github.com",
                               "title": null,
+                              "isGollumLink": false,
+                              "isWikiPage": false,
                               "canonicalSrc": "https://github.com",
                               "isReference": false
                             }
@@ -23926,6 +24244,8 @@
                               "uploading": false,
                               "href": "http://www.github.com",
                               "title": null,
+                              "isGollumLink": false,
+                              "isWikiPage": false,
                               "canonicalSrc": "http://www.github.com",
                               "isReference": false
                             }
@@ -23958,6 +24278,8 @@
                               "uploading": false,
                               "href": "http://pokemon.com",
                               "title": null,
+                              "isGollumLink": false,
+                              "isWikiPage": false,
                               "canonicalSrc": "http://pokemon.com",
                               "isReference": false
                             }
diff --git a/lib/banzai/filter/gollum_tags_filter.rb b/lib/banzai/filter/gollum_tags_filter.rb
index 7c193ccd87b..e949ff194f4 100644
--- a/lib/banzai/filter/gollum_tags_filter.rb
+++ b/lib/banzai/filter/gollum_tags_filter.rb
@@ -64,13 +64,11 @@ module Banzai
           next if has_ancestor?(node, IGNORED_ANCESTOR_TAGS)
           next unless node.content =~ TAGS_PATTERN
 
-          html = process_tag(Regexp.last_match(1))
+          html = node.content.gsub(TAGS_PATTERN) do
+            process_tag(Regexp.last_match(1)) || Regexp.last_match(0)
+          end
 
-          next unless html && html != node.content
-
-          new_node = Banzai::Filter::SanitizationFilter.new(html).call
-          new_node = new_node&.children&.first&.add_class('gfm')
-          node.replace(new_node.to_html) if new_node
+          node.replace(html)
         end
 
         doc
@@ -105,12 +103,12 @@ module Banzai
         path =
           if url?(content)
             content
-          elsif file = wiki.find_file(content, load_content: false)
+          elsif wiki && file = wiki.find_file(content, load_content: false)
             file.path
           end
 
         if path
-          content_tag(:img, nil, src: path, class: 'gfm')
+          sanitized_content_tag(:img, nil, src: path, class: 'gfm')
         end
       end
 
@@ -135,29 +133,48 @@ module Banzai
           name, reference = *parts.compact.map(&:strip)
         end
 
-        href =
-          if url?(reference)
-            reference
-          else
-            ::File.join(wiki_base_path, reference)
-          end
+        class_list = 'gfm'
+        additional_data = {
+          'canonical-src': reference,
+          link: true,
+          gollum: true
+        }
 
-        content_tag(:a, name || reference, href: href, class: 'gfm')
+        if url?(reference)
+          href = reference
+        elsif wiki
+          href = ::File.join(wiki_base_path, reference)
+          class_list += " gfm-gollum-wiki-page"
+
+          additional_data['reference-type'] = 'wiki_page'
+          additional_data[:project] = context[:project].id if context[:project]
+          additional_data[:group] = context[:group]&.id if context[:group]
+        end
+
+        if href
+          sanitized_content_tag(:a, name || reference, href: href, class: class_list, data: additional_data)
+        end
       end
 
       def wiki
-        context[:wiki]
+        context[:wiki] || context[:project]&.wiki || context[:group]&.wiki
       end
 
       def wiki_base_path
         wiki&.wiki_base_path
       end
 
-      # Ensure that a :wiki key exists in context
-      #
-      # Note that while the key might exist, its value could be nil!
-      def validate
-        needs :wiki
+      def sanitized_content_tag(name, content, options = {})
+        html = content_tag(name, content, options)
+        node = Banzai::Filter::SanitizationFilter.new(html).call
+        link_node = node&.children&.first
+
+        link_node.add_class(options[:class])
+        options[:data]&.each do |key, value|
+          link_node.set_attribute("data-#{key}", value)
+        end
+
+        link_node
       end
     end
   end
diff --git a/lib/banzai/pipeline/ascii_doc_pipeline.rb b/lib/banzai/pipeline/ascii_doc_pipeline.rb
index 54306eadd41..c274a65d4a4 100644
--- a/lib/banzai/pipeline/ascii_doc_pipeline.rb
+++ b/lib/banzai/pipeline/ascii_doc_pipeline.rb
@@ -7,6 +7,7 @@ module Banzai
         FilterArray[
           Filter::AsciiDocSanitizationFilter,
           Filter::CodeLanguageFilter,
+          Filter::GollumTagsFilter,
           Filter::AssetProxyFilter,
           Filter::ExternalLinkFilter,
           Filter::PlantumlFilter,
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index 474efe71b70..0493793662f 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -17,6 +17,7 @@ module Banzai
           Filter::SpacedLinkFilter,
           Filter::SanitizationFilter,
           Filter::KrokiFilter,
+          Filter::GollumTagsFilter,
           Filter::AssetProxyFilter,
           Filter::MathFilter,
           Filter::ColorFilter,
diff --git a/lib/banzai/pipeline/wiki_pipeline.rb b/lib/banzai/pipeline/wiki_pipeline.rb
index 96b6b9699f4..706ff1fe284 100644
--- a/lib/banzai/pipeline/wiki_pipeline.rb
+++ b/lib/banzai/pipeline/wiki_pipeline.rb
@@ -4,8 +4,7 @@ module Banzai
   module Pipeline
     class WikiPipeline < FullPipeline
       def self.filters
-        @filters ||= super.insert_before(Filter::ImageLazyLoadFilter, Filter::GollumTagsFilter)
-               .insert_before(Filter::TaskListFilter, Filter::WikiLinkFilter)
+        @filters ||= super.insert_before(Filter::TaskListFilter, Filter::WikiLinkFilter)
       end
     end
   end
diff --git a/lib/banzai/reference_parser/wiki_page_parser.rb b/lib/banzai/reference_parser/wiki_page_parser.rb
new file mode 100644
index 00000000000..e9236241e65
--- /dev/null
+++ b/lib/banzai/reference_parser/wiki_page_parser.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Banzai
+  module ReferenceParser
+    class WikiPageParser < BaseParser
+      self.reference_type = :wiki_page
+
+      def nodes_visible_to_user(user, nodes)
+        project_attr = 'data-project'
+        group_attr = 'data-group'
+
+        projects = lazy { projects_for_nodes(nodes) }
+        groups = lazy { grouped_objects_for_nodes(nodes, Group, group_attr) }
+
+        preload_associations(projects, user)
+
+        nodes.select do |node|
+          if node.has_attribute?(project_attr)
+            can_read_reference?(user, projects[node], node)
+          elsif node.has_attribute?(group_attr)
+            can_read_reference?(user, groups[node], node)
+          else
+            true
+          end
+        end
+      end
+
+      private
+
+      def can_read_reference?(user, project_or_group, _node)
+        can?(user, :read_wiki, project_or_group)
+      end
+    end
+  end
+end
diff --git a/lib/banzai/reference_redactor.rb b/lib/banzai/reference_redactor.rb
index 0c031ace977..b08a0da6893 100644
--- a/lib/banzai/reference_redactor.rb
+++ b/lib/banzai/reference_redactor.rb
@@ -67,6 +67,9 @@ module Banzai
       original_content = node.attr('data-original')
       original_content = CGI.escape_html(original_content) if original_content
 
+      # Redact gollum wiki links completely
+      redacted_content = _('[redacted]') if node.attr('data-reference-type') == 'wiki_page'
+
       # Build the raw <a> tag just with a link as href and content if
       # it's originally a link pattern. We shouldn't return a plain text href.
       original_link =
@@ -78,7 +81,7 @@ module Banzai
 
       # The reference should be replaced by the original link's content,
       # which is not always the same as the rendered one.
-      original_link || original_content || node.inner_html
+      redacted_content || original_link || original_content || node.inner_html
     end
 
     def redact_cross_project_references(documents)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9f22d5990d5..ee660f55068 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -44737,7 +44737,7 @@ msgstr ""
 msgid "ScanResultPolicy|When %{scanType} in an open merge request targeting %{branches} %{branchExceptions} and the licenses match all of the following criteria:"
 msgstr ""
 
-msgid "ScanResultPolicy|When %{scanType} in an open that targets %{branches} %{branchExceptions} with %{commitType}"
+msgid "ScanResultPolicy|When %{scanType} that targets %{branches} %{branchExceptions} with %{commitType}"
 msgstr ""
 
 msgid "ScanResultPolicy|When %{scanners} find scanner specified conditions in an open merge request targeting the %{branches} %{branchExceptions} and match %{boldDescription} of the following criteria"
@@ -59295,6 +59295,9 @@ msgstr ""
 msgid "[Supports GitLab-flavored markdown, including quick actions]"
 msgstr ""
 
+msgid "[redacted]"
+msgstr ""
+
 msgid "`.campfirenow.com` subdomain when you're signed in."
 msgstr ""
 
diff --git a/qa/Gemfile b/qa/Gemfile
index e4af1f20971..ba82d3a9671 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -11,7 +11,7 @@ gem 'capybara', '~> 3.40.0'
 gem 'capybara-screenshot', '~> 1.0.26'
 gem 'rake', '~> 13', '>= 13.1.0'
 gem 'rspec', '~> 3.13'
-gem 'selenium-webdriver', '= 4.18.1'
+gem 'selenium-webdriver', '= 4.19.0'
 gem 'airborne', '~> 0.3.7', require: false # airborne is messing with rspec sandboxed mode so not requiring by default
 gem 'rest-client', '~> 2.1.0'
 gem 'rspec-retry', '~> 0.6.2', require: 'rspec/retry'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index cb52d3dd20a..5d1e9d7bc9c 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -304,7 +304,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    selenium-webdriver (4.18.1)
+    selenium-webdriver (4.19.0)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -379,7 +379,7 @@ DEPENDENCIES
   rspec-retry (~> 0.6.2)
   rspec_junit_formatter (~> 0.6.0)
   ruby-debug-ide (~> 0.7.3)
-  selenium-webdriver (= 4.18.1)
+  selenium-webdriver (= 4.19.0)
   slack-notifier (~> 2.4)
   terminal-table (~> 3.0.2)
   warning (~> 1.3)
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
index 5761c8bf989..6de8604e1d0 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
@@ -48,7 +48,7 @@ module QA
       end
 
       it(
-        'publishes a composer package and deletes it',
+        'publishes a composer package and deletes it', :blocking,
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348016'
       ) do
         Page::Project::Menu.perform(&:go_to_package_registry)
diff --git a/spec/controllers/projects/autocomplete_sources_controller_spec.rb b/spec/controllers/projects/autocomplete_sources_controller_spec.rb
index 22736655795..2c502131e74 100644
--- a/spec/controllers/projects/autocomplete_sources_controller_spec.rb
+++ b/spec/controllers/projects/autocomplete_sources_controller_spec.rb
@@ -287,6 +287,44 @@ RSpec.describe Projects::AutocompleteSourcesController do
     end
   end
 
+  describe 'GET wikis' do
+    before do
+      create(:wiki_page, project: project, title: 'foo')
+      create(:wiki_page, project: project, title: 'templates/template1')
+    end
+
+    context 'when user can read wiki pages' do
+      before do
+        group.add_owner(user)
+        sign_in(user)
+      end
+
+      it 'lists wiki pages (except templates)' do
+        get :wikis, format: :json, params: { namespace_id: group.path, project_id: project.path }
+
+        expect(json_response.pluck('title')).to eq(['foo'])
+      end
+    end
+
+    context 'when user cannot read wiki pages' do
+      let_it_be(:group2) { create(:group, :public) }
+      let_it_be(:project2) { create(:project, :public, namespace: group2) }
+
+      before do
+        create(:wiki_page, project: project2, title: 'foo')
+
+        # set wikis feature to members only
+        project2.project_feature.update!(wiki_access_level: ProjectFeature::PRIVATE)
+      end
+
+      it 'returns an empty list' do
+        get :wikis, format: :json, params: { namespace_id: group2.path, project_id: project2.path }
+
+        expect(json_response).to eq([])
+      end
+    end
+  end
+
   describe 'GET contacts' do
     let_it_be(:contact_1) { create(:contact, group: group) }
     let_it_be(:contact_2) { create(:contact, group: group) }
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index 409153a7725..64d15d2a5d5 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -254,6 +254,24 @@ RSpec.describe 'GFM autocomplete', :js, feature_category: :team_planning do
 
     it_behaves_like 'autocomplete user mentions'
 
+    context 'autocomplete wiki pages' do
+      let_it_be(:wiki_page1) { create(:wiki_page, project: project, title: 'Home') }
+      let_it_be(:wiki_page2) { create(:wiki_page, project: project, title: 'How to use GitLab') }
+
+      it 'shows wiki pages in the autocomplete menu' do
+        fill_in 'Comment', with: '[[ho'
+
+        wait_for_requests
+
+        expect(find_autocomplete_menu).to have_text('Home')
+        expect(find_autocomplete_menu).to have_text('How to use GitLab (How-to-use-GitLab)')
+
+        send_keys [:arrow_down, :enter]
+
+        expect(find_field('Comment').value).to have_text('[[How to use GitLab|How-to-use-GitLab]]')
+      end
+    end
+
     context 'when mention_autocomplete_backend_filtering is disabled' do
       before do
         stub_feature_flags(mention_autocomplete_backend_filtering: false)
diff --git a/spec/frontend/content_editor/components/suggestions_dropdown_spec.js b/spec/frontend/content_editor/components/suggestions_dropdown_spec.js
index c8238618ffd..aea675a135b 100644
--- a/spec/frontend/content_editor/components/suggestions_dropdown_spec.js
+++ b/spec/frontend/content_editor/components/suggestions_dropdown_spec.js
@@ -78,6 +78,16 @@ describe('~/content_editor/components/suggestions_dropdown', () => {
     },
     fieldValue: 'smiley',
   };
+  const exampleWiki = {
+    title: 'Home',
+    slug: 'home',
+    path: '/path/to/project/-/wikis/home',
+  };
+  const exampleWiki2 = {
+    title: 'Changelog',
+    slug: 'docs/changelog',
+    path: '/path/to/project/-/wikis/docs/changelog',
+  };
 
   const insertedEmojiProps = {
     name: 'smiley',
@@ -147,6 +157,7 @@ describe('~/content_editor/components/suggestions_dropdown', () => {
       ${'reference'} | ${'snippet'}       | ${exampleSnippet}       | ${'project'} | ${'<strong class="gl-text-body!">Project</strong> creation QueryRecorder logs'}
       ${'reference'} | ${'snippet'}       | ${exampleSnippet}       | ${'242'}     | ${'<strong class="gl-text-body!">242</strong>0859'}
       ${'emoji'}     | ${'emoji'}         | ${exampleEmoji}         | ${'sm'}      | ${'<strong class="gl-text-body!">sm</strong>iley'}
+      ${'wiki'}      | ${'wiki'}          | ${exampleWiki}          | ${'home'}    | ${'<strong class="gl-text-body!">Home</strong>'}
     `(
       'highlights query as bolded in $referenceType text',
       ({ nodeType, referenceType, reference, query, expectedHTML }) => {
@@ -185,6 +196,7 @@ describe('~/content_editor/components/suggestions_dropdown', () => {
       ${'reference'} | ${'vulnerability'} | ${'[vulnerability:'} | ${exampleVulnerability} | ${`[vulnerability:60850147]`} | ${{}}
       ${'reference'} | ${'snippet'}       | ${'$'}               | ${exampleSnippet}       | ${`$2420859`}                 | ${{}}
       ${'emoji'}     | ${'emoji'}         | ${':'}               | ${exampleEmoji}         | ${`😃`}                       | ${insertedEmojiProps}
+      ${'link'}      | ${'wiki'}          | ${'[['}              | ${exampleWiki}          | ${`Home`}                     | ${{ canonicalSrc: 'home', href: '/path/to/project/-/wikis/home', isGollumLink: true, isWikiPage: true }}
     `(
       'runs a command to insert the selected $referenceType',
       async ({ char, nodeType, referenceType, reference, insertedText, insertedProps }) => {
@@ -308,6 +320,40 @@ describe('~/content_editor/components/suggestions_dropdown', () => {
       });
     });
 
+    describe('rendering wiki references', () => {
+      it('displays wiki title', () => {
+        buildWrapper({
+          propsData: {
+            char: '[[',
+            nodeType: 'link',
+            nodeProps: {
+              referenceType: 'wiki',
+            },
+            items: [exampleWiki],
+          },
+        });
+
+        expect(wrapper.text()).toContain(exampleWiki.title);
+        expect(wrapper.text()).not.toContain(exampleWiki.slug);
+      });
+
+      it('displays wiki slug if title is not the same as the slug', () => {
+        buildWrapper({
+          propsData: {
+            char: '[[',
+            nodeType: 'link',
+            nodeProps: {
+              referenceType: 'wiki',
+            },
+            items: [exampleWiki2],
+          },
+        });
+
+        expect(wrapper.text()).toContain(exampleWiki2.title);
+        expect(wrapper.text()).toContain(exampleWiki2.slug);
+      });
+    });
+
     describe('rendering epic references', () => {
       it('displays epic title and reference', () => {
         buildWrapper({
diff --git a/spec/frontend/content_editor/services/__snapshots__/autocomplete_helper_spec.js.snap b/spec/frontend/content_editor/services/__snapshots__/autocomplete_helper_spec.js.snap
index 401ed8bd062..52a697114d5 100644
--- a/spec/frontend/content_editor/services/__snapshots__/autocomplete_helper_spec.js.snap
+++ b/spec/frontend/content_editor/services/__snapshots__/autocomplete_helper_spec.js.snap
@@ -254,3 +254,10 @@ Array [
   "Cross Site Scripting (Persistent)",
 ]
 `;
+
+exports[`AutocompleteHelper for reference type "wiki", searches for "ho" correctly 1`] = `
+Array [
+  "Home",
+  "How to use GitLab",
+]
+`;
diff --git a/spec/frontend/content_editor/services/autocomplete_helper_spec.js b/spec/frontend/content_editor/services/autocomplete_helper_spec.js
index ab2ec2aa83b..216e35ffa35 100644
--- a/spec/frontend/content_editor/services/autocomplete_helper_spec.js
+++ b/spec/frontend/content_editor/services/autocomplete_helper_spec.js
@@ -17,6 +17,7 @@ import {
   MOCK_MERGE_REQUESTS,
   MOCK_ASSIGNEES,
   MOCK_REVIEWERS,
+  MOCK_WIKIS,
 } from './autocomplete_mock_data';
 
 jest.mock('~/emoji', () => ({
@@ -122,6 +123,7 @@ describe('AutocompleteHelper', () => {
       mergeRequests: '/mergeRequests',
       vulnerabilities: '/vulnerabilities',
       commands: '/commands',
+      wikis: '/wikis',
     };
 
     mock.onGet('/members').reply(200, MOCK_MEMBERS);
@@ -133,6 +135,7 @@ describe('AutocompleteHelper', () => {
     mock.onGet('/mergeRequests').reply(200, MOCK_MERGE_REQUESTS);
     mock.onGet('/vulnerabilities').reply(200, MOCK_VULNERABILITIES);
     mock.onGet('/commands').reply(200, MOCK_COMMANDS);
+    mock.onGet('/wikis').reply(200, MOCK_WIKIS);
 
     const sidebarMediator = {
       store: {
@@ -170,6 +173,7 @@ describe('AutocompleteHelper', () => {
     ${'merge_request'} | ${'n'}
     ${'vulnerability'} | ${'cross'}
     ${'command'}       | ${'re'}
+    ${'wiki'}          | ${'ho'}
   `(
     'for reference type "$referenceType", searches for "$query" correctly',
     async ({ referenceType, query }) => {
diff --git a/spec/frontend/content_editor/services/autocomplete_mock_data.js b/spec/frontend/content_editor/services/autocomplete_mock_data.js
index c1bf2a6ae5b..a1e695a0fec 100644
--- a/spec/frontend/content_editor/services/autocomplete_mock_data.js
+++ b/spec/frontend/content_editor/services/autocomplete_mock_data.js
@@ -965,3 +965,21 @@ export const MOCK_COMMANDS = [
     params: ['\u003c#issue | group/project#issue | issue URL\u003e'],
   },
 ];
+
+export const MOCK_WIKIS = [
+  {
+    title: 'Home',
+    slug: 'home',
+    path: '/gitlab-org/gitlab-test/-/wikis/home',
+  },
+  {
+    title: 'How to use GitLab',
+    slug: 'how-to-use-gitlab',
+    path: '/gitlab-org/gitlab-test/-/wikis/how-to-use-gitlab',
+  },
+  {
+    title: 'Changelog',
+    slug: 'changelog',
+    path: '/gitlab-org/gitlab-test/-/wikis/changelog',
+  },
+];
diff --git a/spec/frontend/content_editor/services/markdown_serializer_spec.js b/spec/frontend/content_editor/services/markdown_serializer_spec.js
index aeaa63a332f..8367384fda4 100644
--- a/spec/frontend/content_editor/services/markdown_serializer_spec.js
+++ b/spec/frontend/content_editor/services/markdown_serializer_spec.js
@@ -272,6 +272,31 @@ describe('markdownSerializer', () => {
     ).toBe('[GitLab][gitlab-url]');
   });
 
+  it.each`
+    title          | canonicalSrc        | serialized
+    ${'Usage'}     | ${'usage'}          | ${'[[Usage]]'}
+    ${'Changelog'} | ${'docs/changelog'} | ${'[[Changelog|docs/changelog]]'}
+  `(
+    'correctly serializes a gollum (wiki) link: $serialized',
+    ({ title, canonicalSrc, serialized }) => {
+      expect(
+        serialize(
+          paragraph(
+            link(
+              {
+                isGollumLink: true,
+                isWikiPage: true,
+                href: '/gitlab-org/gitlab-test/-/wikis/link/to/some/wiki/page',
+                canonicalSrc,
+              },
+              title,
+            ),
+          ),
+        ),
+      ).toBe(serialized);
+    },
+  );
+
   it('correctly serializes image references', () => {
     expect(
       serialize(
diff --git a/spec/frontend/gfm_auto_complete_spec.js b/spec/frontend/gfm_auto_complete_spec.js
index a0dec3e2568..2249439b29a 100644
--- a/spec/frontend/gfm_auto_complete_spec.js
+++ b/spec/frontend/gfm_auto_complete_spec.js
@@ -23,6 +23,8 @@ import {
   crmContactsMock,
 } from 'ee_else_ce_jest/gfm_auto_complete/mock_data';
 
+const mockSpriteIcons = '/icons.svg';
+
 describe('escape', () => {
   it.each`
     xssPayload                                           | escapedPayload
@@ -55,6 +57,10 @@ describe('GfmAutoComplete', () => {
     jest.runOnlyPendingTimers();
   };
 
+  beforeEach(() => {
+    window.gon = { sprite_icons: mockSpriteIcons };
+  });
+
   describe('DefaultOptions.filter', () => {
     let items;
 
@@ -577,7 +583,7 @@ describe('GfmAutoComplete', () => {
           title: 'My Group',
           search: 'MyGroup my-group',
           icon:
-            '<svg class="s16 vertical-align-middle gl-ml-2"><use xlink:href="undefined#notifications-off" /></svg>',
+            '<svg class="s16 vertical-align-middle gl-ml-2"><use xlink:href="/icons.svg#notifications-off" /></svg>',
         },
       ]);
     });
@@ -772,6 +778,54 @@ describe('GfmAutoComplete', () => {
     });
   });
 
+  describe('GfmAutoComplete.Wikis', () => {
+    const wikiPage1 = {
+      title: 'My Wiki Page',
+      slug: 'my-wiki-page',
+      path: '/path/to/project/-/wikis/my-wiki-page',
+    };
+    const wikiPage2 = {
+      title: 'Home',
+      slug: 'home',
+      path: '/path/to/project/-/wikis/home',
+    };
+
+    describe('templateFunction', () => {
+      it('shows both title and slug, if they are different', () => {
+        expect(GfmAutoComplete.Wikis.templateFunction(wikiPage1)).toMatchInlineSnapshot(`
+          <li>
+            <svg
+              class="gl-mr-2 s16 vertical-align-middle"
+            >
+              <use
+                xlink:href="/icons.svg#document"
+              />
+            </svg>
+            My Wiki Page
+            <small>
+              (my-wiki-page)
+            </small>
+          </li>
+        `);
+      });
+
+      it('shows only title, if title and slug are the same', () => {
+        expect(GfmAutoComplete.Wikis.templateFunction(wikiPage2)).toMatchInlineSnapshot(`
+          <li>
+            <svg
+              class="gl-mr-2 s16 vertical-align-middle"
+            >
+              <use
+                xlink:href="/icons.svg#document"
+              />
+            </svg>
+            Home
+          </li>
+        `);
+      });
+    });
+  });
+
   describe('labels', () => {
     const dataSources = {
       labels: `${TEST_HOST}/autocomplete_sources/labels`,
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index dc28ffe657e..33e8c79535a 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -452,7 +452,7 @@ RSpec.describe ApplicationHelper do
 
       it 'returns paths for autocomplete_sources_controller' do
         sources = helper.autocomplete_data_sources(project, noteable_type)
-        expect(sources.keys).to match_array([:members, :issues, :mergeRequests, :labels, :milestones, :commands, :snippets, :contacts])
+        expect(sources.keys).to match_array([:members, :issues, :mergeRequests, :labels, :milestones, :commands, :snippets, :contacts, :wikis])
         sources.keys.each do |key|
           expect(sources[key]).not_to be_nil
         end
diff --git a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
index 5e3084b9845..f6335b25535 100644
--- a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
+++ b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
@@ -5,14 +5,9 @@ require 'spec_helper'
 RSpec.describe Banzai::Filter::GollumTagsFilter, feature_category: :wiki do
   include FilterSpecHelper
 
-  let(:project) { create(:project) }
-  let(:wiki) { ProjectWiki.new(project, nil) }
-
-  describe 'validation' do
-    it 'ensure that a :wiki key exists in context' do
-      expect { filter("See [[images/image.jpg]]", {}) }.to raise_error ArgumentError, "Missing context keys for Banzai::Filter::GollumTagsFilter: :wiki"
-    end
-  end
+  let_it_be(:project) { create(:project) }
+  let_it_be(:wiki) { create(:project_wiki, project: project) }
+  let_it_be(:group) { create(:group) }
 
   context 'linking internal images' do
     it 'creates img tag if image exists' do
@@ -68,6 +63,13 @@ RSpec.describe Banzai::Filter::GollumTagsFilter, feature_category: :wiki do
       expect(doc.at_css('a').text).to eq 'link-text'
       expect(doc.at_css('a')['href']).to eq 'http://example.com/pdfs/gollum.pdf'
     end
+
+    it 'does not add `gfm-gollum-wiki-page` class to the link' do
+      tag = '[[http://example.com]]'
+      doc = filter("See #{tag}", wiki: wiki)
+
+      expect(doc.at_css('a')['class']).to eq 'gfm'
+    end
   end
 
   context 'linking internal resources' do
@@ -78,6 +80,12 @@ RSpec.describe Banzai::Filter::GollumTagsFilter, feature_category: :wiki do
 
       expect(doc.at_css('a').text).to eq 'wiki-slug'
       expect(doc.at_css('a')['href']).to eq expected_path
+      expect(doc.at_css('a')['data-reference-type']).to eq 'wiki_page'
+      expect(doc.at_css('a')['data-canonical-src']).to eq 'wiki-slug'
+      expect(doc.at_css('a')['data-gollum']).to eq 'true'
+      expect(doc.at_css('a')['data-project']).to eq project.id.to_s
+      expect(doc.at_css('a')['data-group']).to be_nil
+      expect(doc.at_css('a')['class']).to eq 'gfm gfm-gollum-wiki-page'
     end
 
     it "the created link's text will be link-text" do
@@ -89,24 +97,46 @@ RSpec.describe Banzai::Filter::GollumTagsFilter, feature_category: :wiki do
       expect(doc.at_css('a')['href']).to eq expected_path
     end
 
-    it "inside back ticks will be exempt from linkification" do
+    it 'inside back ticks will be exempt from linkification' do
       doc = filter('<code>[[link-in-backticks]]</code>', wiki: wiki)
 
       expect(doc.at_css('code').text).to eq '[[link-in-backticks]]'
     end
 
-    it "sanitizes the href attribute (case 1)" do
-      tag = '[[a|http:\'"injected=attribute&gt;&lt;img/src="0"onerror="alert(0)"&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1]]'
-      doc = filter("See #{tag}", wiki: wiki)
+    it 'handles group wiki links' do
+      tag = '[[wiki-slug]]'
+      doc = filter("See #{tag}", project: nil, group: group, wiki: wiki)
+      expected_path = ::File.join(wiki.wiki_base_path, 'wiki-slug')
 
-      expect(doc.at_css('a').to_html).to eq '<a href="http:\'%22injected=attribute&gt;&lt;img/src=%220%22onerror=%22alert(0)%22&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1" class="gfm">a</a>'
-    end
-
-    it "sanitizes the href attribute (case 2)" do
-      tag = '<i>[[a|\'"&gt;&lt;svg&gt;&lt;i/class=gl-show-field-errors&gt;&lt;input/title="&lt;script&gt;alert(0)&lt;/script&gt;"/&gt;&lt;/svg&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1]]'
-      doc = filter("See #{tag}", wiki: wiki)
-
-      expect(doc.at_css('i a').to_html).to eq "<a href=\"#{wiki.wiki_base_path}/\'%22&gt;&lt;svg&gt;&lt;i/class=gl-show-field-errors&gt;&lt;input/title=%22&lt;script&gt;alert(0)&lt;/script&gt;%22/&gt;&lt;/svg&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1\" class=\"gfm\">a</a>"
+      expect(doc.at_css('a').text).to eq 'wiki-slug'
+      expect(doc.at_css('a')['href']).to eq expected_path
+      expect(doc.at_css('a')['data-reference-type']).to eq 'wiki_page'
+      expect(doc.at_css('a')['data-canonical-src']).to eq 'wiki-slug'
+      expect(doc.at_css('a')['data-gollum']).to eq 'true'
+      expect(doc.at_css('a')['data-project']).to be_nil
+      expect(doc.at_css('a')['data-group']).to eq group.id.to_s
+      expect(doc.at_css('a')['class']).to eq 'gfm gfm-gollum-wiki-page'
     end
   end
+
+  it 'adds `gfm-gollum-wiki-page` classes to the link' do
+    tag = '[[wiki-slug]]'
+    doc = filter("See #{tag}", wiki: wiki)
+
+    expect(doc.at_css('a')['class']).to eq 'gfm gfm-gollum-wiki-page'
+  end
+
+  it 'sanitizes the href attribute (case 1)' do
+    tag = '[[a|http:\'"injected=attribute&gt;&lt;img/src="0"onerror="alert(0)"&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1]]'
+    doc = filter("See #{tag}", wiki: wiki)
+
+    expect(doc.at_css('a').to_html).to eq '<a href="http:\'%22injected=attribute&gt;&lt;img/src=%220%22onerror=%22alert(0)%22&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1" class="gfm" data-canonical-src="http:\'&quot;injected=attribute&gt;&lt;img/src=&quot;0&quot;onerror=&quot;alert(0)&quot;&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1" data-link="true" data-gollum="true">a</a>'
+  end
+
+  it 'sanitizes the href attribute (case 2)' do
+    tag = '<i>[[a|\'"&gt;&lt;svg&gt;&lt;i/class=gl-show-field-errors&gt;&lt;input/title="&lt;script&gt;alert(0)&lt;/script&gt;"/&gt;&lt;/svg&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1]]'
+    doc = filter("See #{tag}", wiki: wiki)
+
+    expect(doc.at_css('i a').to_html).to eq "<a href=\"#{wiki.wiki_base_path}/'%22&gt;&lt;svg&gt;&lt;i/class=gl-show-field-errors&gt;&lt;input/title=%22&lt;script&gt;alert(0)&lt;/script&gt;%22/&gt;&lt;/svg&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1\" class=\"gfm gfm-gollum-wiki-page\" data-canonical-src=\"'&quot;&gt;&lt;svg&gt;&lt;i/class=gl-show-field-errors&gt;&lt;input/title=&quot;&lt;script&gt;alert(0)&lt;/script&gt;&quot;/&gt;&lt;/svg&gt;https://gitlab.com/gitlab-org/gitlab/-/issues/1\" data-link=\"true\" data-gollum=\"true\" data-reference-type=\"wiki_page\" data-project=\"#{project.id}\">a</a>"
+  end
 end
diff --git a/spec/lib/banzai/reference_parser/wiki_page_parser_spec.rb b/spec/lib/banzai/reference_parser/wiki_page_parser_spec.rb
new file mode 100644
index 00000000000..612881ddd98
--- /dev/null
+++ b/spec/lib/banzai/reference_parser/wiki_page_parser_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Banzai::ReferenceParser::WikiPageParser, feature_category: :team_planning do
+  include ReferenceParserHelpers
+
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+
+  let(:link) { empty_html_link }
+
+  describe '#nodes_visible_to_user' do
+    before do
+      link['data-reference-type'] = 'wiki_page'
+    end
+
+    context 'when the link has a data-project attribute' do
+      before do
+        link['data-project'] = project.id
+      end
+
+      it 'redacts the link if the user cannot read the project' do
+        nodes = described_class
+          .new(Banzai::RenderContext.new(project, user))
+          .nodes_visible_to_user(user, [link])
+
+        expect(nodes).to be_empty
+      end
+    end
+
+    context 'when the link has a data-group attribute' do
+      before do
+        link['data-group'] = group.id
+      end
+
+      it 'redacts the link if the user cannot read the group' do
+        nodes = described_class
+          .new(Banzai::RenderContext.new(group, user))
+          .nodes_visible_to_user(user, [link])
+
+        expect(nodes).to be_empty
+      end
+    end
+
+    context 'if no data-project or data-group attribute is present' do
+      it 'returns the link' do
+        nodes = described_class
+          .new(Banzai::RenderContext.new(project, user))
+          .nodes_visible_to_user(user, [link])
+
+        expect(nodes).to eq([link])
+      end
+    end
+  end
+end
diff --git a/spec/lib/banzai/reference_redactor_spec.rb b/spec/lib/banzai/reference_redactor_spec.rb
index 21736903cbf..6d927b24b20 100644
--- a/spec/lib/banzai/reference_redactor_spec.rb
+++ b/spec/lib/banzai/reference_redactor_spec.rb
@@ -103,6 +103,18 @@ RSpec.describe Banzai::ReferenceRedactor, feature_category: :team_planning do
         expect(doc2.to_html).to eq(doc2_html)
       end
     end
+
+    context 'when reference is a gollum wiki page link that is not visible to user' do
+      it 'redacts the wiki page title and href' do
+        doc = Nokogiri::HTML.fragment('<a class="gfm" href="https://gitlab.com/path/to/project/-/wikis/foo" data-reference-type="wiki_page" data-gollum="true">foo</a>')
+
+        expect(redactor).to receive(:nodes_visible_to_user).and_return([])
+
+        redactor.redact([doc])
+
+        expect(doc.to_html).to eq('[redacted]')
+      end
+    end
   end
 
   context 'when the user cannot read cross project' do
diff --git a/spec/scripts/lib/glfm/update_example_snapshots_spec.rb b/spec/scripts/lib/glfm/update_example_snapshots_spec.rb
index 78cdb81f80c..316482029b4 100644
--- a/spec/scripts/lib/glfm/update_example_snapshots_spec.rb
+++ b/spec/scripts/lib/glfm/update_example_snapshots_spec.rb
@@ -821,6 +821,8 @@ RSpec.describe Glfm::UpdateExampleSnapshots, '#process', feature_category: :team
                             "uploading": false,
                             "href": "/uploads/groups-test-file",
                             "title": null,
+                            "isGollumLink": false,
+                            "isWikiPage": false,
                             "canonicalSrc": "/uploads/groups-test-file",
                             "isReference": false
                           }
@@ -848,6 +850,8 @@ RSpec.describe Glfm::UpdateExampleSnapshots, '#process', feature_category: :team
                             "uploading": false,
                             "href": "projects-test-file",
                             "title": null,
+                            "isGollumLink": false,
+                            "isWikiPage": false,
                             "canonicalSrc": "projects-test-file",
                             "isReference": false
                           }
@@ -905,6 +909,8 @@ RSpec.describe Glfm::UpdateExampleSnapshots, '#process', feature_category: :team
                             "uploading": false,
                             "href": "project-wikis-test-file",
                             "title": null,
+                            "isGollumLink": false,
+                            "isWikiPage": false,
                             "canonicalSrc": "project-wikis-test-file",
                             "isReference": false
                           }
diff --git a/spec/services/projects/autocomplete_service_spec.rb b/spec/services/projects/autocomplete_service_spec.rb
index 0ec6362761e..98304c54542 100644
--- a/spec/services/projects/autocomplete_service_spec.rb
+++ b/spec/services/projects/autocomplete_service_spec.rb
@@ -153,6 +153,39 @@ RSpec.describe Projects::AutocompleteService, feature_category: :groups_and_proj
     end
   end
 
+  describe '#wikis' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:group) { create(:group, :public) }
+    let_it_be(:project) { create(:project, :public, group: group) }
+    let_it_be(:wiki) { create(:project_wiki, project: project) }
+
+    before do
+      create(:wiki_page, wiki: wiki, title: 'page1', content: 'content1')
+      create(:wiki_page, wiki: wiki, title: 'templates/page2', content: 'content2')
+    end
+
+    context 'when user can read wiki' do
+      it 'returns wiki pages (except templates)' do
+        service = described_class.new(project, user)
+        results = service.wikis
+
+        expect(results.size).to eq(1)
+        expect(results.first).to include(path: "/#{project.full_path}/-/wikis/page1", slug: 'page1', title: 'page1')
+      end
+    end
+
+    context 'when user cannot read wiki' do
+      it 'returns empty array' do
+        project.project_feature.update!(wiki_access_level: ProjectFeature::PRIVATE)
+
+        service = described_class.new(project, nil)
+        results = service.wikis
+
+        expect(results).to be_empty
+      end
+    end
+  end
+
   describe '#contacts' do
     let_it_be(:user) { create(:user) }
     let_it_be(:contact_1) { create(:contact, group: group) }
diff --git a/spec/support/shared_examples/features/rich_text_editor/autocomplete_shared_examples.rb b/spec/support/shared_examples/features/rich_text_editor/autocomplete_shared_examples.rb
index 6eb6c1e60f1..6f71fa69057 100644
--- a/spec/support/shared_examples/features/rich_text_editor/autocomplete_shared_examples.rb
+++ b/spec/support/shared_examples/features/rich_text_editor/autocomplete_shared_examples.rb
@@ -17,6 +17,7 @@ RSpec.shared_examples 'rich text editor - autocomplete' do |params = {
         create(:merge_request, source_project: project, source_branch: 'branch-1', title: 'My Cool Merge Request')
         create(:label, project: project, title: 'My Cool Label')
         create(:milestone, project: project, title: 'My Cool Milestone')
+        create(:wiki_page, wiki: project.wiki, title: 'My Cool Wiki Page', content: 'Example')
 
         project.add_maintainer(create(:user, name: 'abc123', username: 'abc123'))
       else # group wikis
@@ -26,6 +27,7 @@ RSpec.shared_examples 'rich text editor - autocomplete' do |params = {
         create(:merge_request, source_project: project, source_branch: 'branch-1', title: 'My Cool Merge Request')
         create(:group_label, group: group, title: 'My Cool Label')
         create(:milestone, group: group, title: 'My Cool Milestone')
+        create(:wiki_page, wiki: group.wiki, title: 'My Cool Wiki Page', content: 'Example')
 
         project.add_maintainer(create(:user, name: 'abc123', username: 'abc123'))
       end
@@ -232,6 +234,23 @@ RSpec.shared_examples 'rich text editor - autocomplete' do |params = {
       expect(page).to have_text('😄')
     end
 
+    it 'shows suggestions for wiki pages' do
+      type_in_content_editor '[[My'
+
+      expect(find(suggestions_dropdown)).to have_text('My Cool Wiki Page')
+
+      send_keys :enter
+
+      expect(page).not_to have_css(suggestions_dropdown)
+      expect(page).to have_text('My Cool Wiki Page')
+
+      click_button 'Switch to plain text editing'
+      wait_for_requests
+
+      # ensure serialized markdown is in correct format (gollum/wikilinks)
+      expect(page.find('textarea').value).to include('[[My Cool Wiki Page|My-Cool-Wiki-Page]]')
+    end
+
     it 'doesn\'t show suggestions dropdown if there are no suggestions to show' do
       type_in_content_editor '%'
 
diff --git a/spec/support/shared_examples/features/wiki/autocomplete_shared_examples.rb b/spec/support/shared_examples/features/wiki/autocomplete_shared_examples.rb
index 64308e3114e..48c82eed98c 100644
--- a/spec/support/shared_examples/features/wiki/autocomplete_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/autocomplete_shared_examples.rb
@@ -7,6 +7,7 @@ RSpec.shared_examples 'autocompletes items' do
       create(:merge_request, source_project: project, title: 'My Cool Merge Request')
       create(:label, project: project, title: 'My Cool Label')
       create(:milestone, project: project, title: 'My Cool Milestone')
+      create(:wiki_page, wiki: project.wiki, title: 'My Cool Wiki Page', content: 'Example')
 
       project.add_maintainer(create(:user, name: 'JohnDoe123'))
       project.add_maintainer(create(:user, name: 'ReallyLongUsername1234567890'))
@@ -17,6 +18,7 @@ RSpec.shared_examples 'autocompletes items' do
       create(:merge_request, source_project: project, title: 'My Cool Merge Request')
       create(:group_label, group: group, title: 'My Cool Label')
       create(:milestone, group: group, title: 'My Cool Milestone')
+      create(:wiki_page, wiki: group.wiki, title: 'My Cool Wiki Page', content: 'Example')
 
       project.add_maintainer(create(:user, name: 'JohnDoe123'))
       project.add_maintainer(create(:user, name: 'ReallyLongUsername1234567890'))
@@ -41,6 +43,9 @@ RSpec.shared_examples 'autocompletes items' do
 
     fill_in :wiki_content, with: ':smil'
     expect(page).to have_text 'smile_cat'
+
+    fill_in :wiki_content, with: '[[My'
+    expect(page).to have_text 'My Cool Wiki Page'
   end
 
   it 'autocompletes items with long names' do