Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2022-10-10 21:09:02 +00:00
parent 69dec37072
commit b520023279
6 changed files with 25 additions and 11 deletions

View File

@ -44,7 +44,7 @@ export default {
:items="databases"
right
:toggle-text="selectedDatabase"
aria-labelledby="label"
toggle-aria-labelled-by="label"
@select="selectDatabase"
/>
</div>

View File

@ -70,12 +70,15 @@ export default {
},
computed: {
mdTable() {
const header = 'header';
const header = s__('MarkdownEditor|header');
const divider = '-'.repeat(header.length);
const cell = ' '.repeat(header.length);
return [
`| ${header} | ${header} |`,
'| ------ | ------ |',
'| | |',
'| | |',
`| ${divider} | ${divider} |`,
`| ${cell} | ${cell} |`,
`| ${cell} | ${cell} |`,
].join('\n');
},
mdSuggestion() {
@ -84,7 +87,8 @@ export default {
);
},
mdCollapsibleSection() {
return ['<details><summary>Click to expand</summary>', `{text}`, '</details>'].join('\n');
const expandText = s__('MarkdownEditor|Click to expand');
return [`<details><summary>${expandText}</summary>`, `{text}`, '</details>'].join('\n');
},
isMac() {
// Accessing properties using ?. to allow tests to use

View File

@ -363,6 +363,10 @@ Do not use Latin abbreviations. Use **for example**, **such as**, **for instance
Do not use **e-mail** with a hyphen. When plural, use **emails** or **email messages**. ([Vale](../testing.md#vale) rule: [`SubstitutionSuggestions.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/SubstitutionSuggestions.yml))
## emojis
Use **emojis** to refer to the plural form of **emoji**.
## enable
See [the Microsoft style guide](https://learn.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/e/enable-enables) for guidance on **enable**.

View File

@ -24586,6 +24586,9 @@ msgstr ""
msgid "MarkdownEditor|Add strikethrough text (%{modifier_key}⇧X)"
msgstr ""
msgid "MarkdownEditor|Click to expand"
msgstr ""
msgid "MarkdownEditor|Indent line (%{modifierKey}])"
msgstr ""
@ -24598,6 +24601,9 @@ msgstr ""
msgid "MarkdownEditor|Outdent line (%{modifier_key}[)"
msgstr ""
msgid "MarkdownEditor|header"
msgstr ""
msgid "MarkdownToolbar|Supports %{markdownDocsLinkStart}Markdown%{markdownDocsLinkEnd}"
msgstr ""

View File

@ -53,7 +53,7 @@
"@gitlab/at.js": "1.5.7",
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/svgs": "3.4.0",
"@gitlab/ui": "44.0.0",
"@gitlab/ui": "45.0.0",
"@gitlab/visual-review-tools": "1.7.3",
"@gitlab/web-ide": "0.0.1-dev-20220815034418",
"@rails/actioncable": "6.1.4-7",

View File

@ -1074,10 +1074,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.4.0.tgz#cfc8319e259e5914ad0f48ee0ab6e0eec75d03da"
integrity sha512-myCYbjViOI2k6oHGRqL1iKaMKbYvPqWL6tYZ07QkUKziVz5kYjECWk5c0Qp6yu9NsFAMWuow5PkR3oFTGBHmbg==
"@gitlab/ui@44.0.0":
version "44.0.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-44.0.0.tgz#70693077ee9315e4743357a2306dd344b681203e"
integrity sha512-zfYL4c0ziGry1bDBjfYtd1t2qQ+z4cXGYCNprNKOIQCXgG9759EuopytyOEHf8yMJDwunTzFNOAkPtOsD7DzQA==
"@gitlab/ui@45.0.0":
version "45.0.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-45.0.0.tgz#cf098b38a48d6f58c74d2d6807dd106f55cbe5bf"
integrity sha512-I+LfjXmLNrzRvZtCqI9JFc8RZsHcNBh5M8ReAzlb9ge4mkQqPNE9FyYP9RWKWVSs9STGig7SKgclsIe1XgcaLg==
dependencies:
"@popperjs/core" "^2.11.2"
bootstrap-vue "2.20.1"