Commit ac59ecff authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'ericschurter-master-patch-64787' into 'master'

Remove link to content editor feedback issue

See merge request gitlab-org/gitlab!83529
parents 492fbde5 f22dab40
...@@ -3,7 +3,7 @@ import { GlForm, GlIcon, GlLink, GlButton, GlSprintf, GlAlert } from '@gitlab/ui ...@@ -3,7 +3,7 @@ import { GlForm, GlIcon, GlLink, GlButton, GlSprintf, GlAlert } from '@gitlab/ui
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import csrf from '~/lib/utils/csrf'; import csrf from '~/lib/utils/csrf';
import { setUrlFragment } from '~/lib/utils/url_utility'; import { setUrlFragment } from '~/lib/utils/url_utility';
import { __, s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import Tracking from '~/tracking'; import Tracking from '~/tracking';
import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import MarkdownField from '~/vue_shared/components/markdown/field.vue';
import { import {
...@@ -54,9 +54,6 @@ export default { ...@@ -54,9 +54,6 @@ export default {
), ),
primaryAction: s__('WikiPage|Retry'), primaryAction: s__('WikiPage|Retry'),
}, },
feedbackTip: __(
'Tell us your experiences with the new Markdown editor %{linkStart}in this feedback issue%{linkEnd}.',
),
}, },
linksHelpText: s__( linksHelpText: s__(
'WikiPage|To link to a (new) page, simply type %{linkExample}. More examples are in the %{linkStart}documentation%{linkEnd}.', 'WikiPage|To link to a (new) page, simply type %{linkExample}. More examples are in the %{linkStart}documentation%{linkEnd}.',
...@@ -403,20 +400,6 @@ export default { ...@@ -403,20 +400,6 @@ export default {
</template> </template>
</markdown-field> </markdown-field>
<div v-if="isContentEditorActive"> <div v-if="isContentEditorActive">
<gl-alert class="gl-mb-6" variant="tip" :dismissible="false">
<gl-sprintf :message="$options.i18n.contentEditor.feedbackTip">
<template
#link="// eslint-disable-next-line vue/no-template-shadow
{ content }"
><gl-link
:href="$options.contentEditorFeedbackIssue"
target="_blank"
data-testid="wiki-markdown-help-link"
>{{ content }}</gl-link
></template
>
</gl-sprintf>
</gl-alert>
<content-editor <content-editor
:render-markdown="renderMarkdown" :render-markdown="renderMarkdown"
:uploads-path="pageInfo.uploadsPath" :uploads-path="pageInfo.uploadsPath"
......
...@@ -36906,9 +36906,6 @@ msgstr "" ...@@ -36906,9 +36906,6 @@ msgstr ""
msgid "Telephone number" msgid "Telephone number"
msgstr "" msgstr ""
msgid "Tell us your experiences with the new Markdown editor %{linkStart}in this feedback issue%{linkEnd}."
msgstr ""
msgid "Template" msgid "Template"
msgstr "" msgstr ""
......
...@@ -411,10 +411,6 @@ describe('WikiForm', () => { ...@@ -411,10 +411,6 @@ describe('WikiForm', () => {
await waitForPromises(); await waitForPromises();
}); });
it('shows a tip to send feedback', () => {
expect(wrapper.text()).toContain('Tell us your experiences with the new Markdown editor');
});
it('shows the rich text editor when loading finishes', async () => { it('shows the rich text editor when loading finishes', async () => {
expect(findContentEditor().exists()).toBe(true); expect(findContentEditor().exists()).toBe(true);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment