Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f22dab40
Commit
f22dab40
authored
Mar 23, 2022
by
Eric Schurter
Committed by
Enrique Alcantara
Mar 31, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove link to content editor feedback issue
Changelog: changed
parent
14d70fcd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
25 deletions
+1
-25
app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue
...s/javascripts/pages/shared/wikis/components/wiki_form.vue
+1
-18
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/frontend/pages/shared/wikis/components/wiki_form_spec.js
.../frontend/pages/shared/wikis/components/wiki_form_spec.js
+0
-4
No files found.
app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue
View file @
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"
...
...
locale/gitlab.pot
View file @
f22dab40
...
@@ -36918,9 +36918,6 @@ msgstr ""
...
@@ -36918,9 +36918,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 ""
...
...
spec/frontend/pages/shared/wikis/components/wiki_form_spec.js
View file @
f22dab40
...
@@ -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
);
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment