Commit 1a0c3a85 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'vs/update-eslint-config' into 'master'

Update @gitlab/eslint-config to 11.0.0

See merge request gitlab-org/gitlab!81373
parents 557f8fef 3e4a5d3b
...@@ -27,8 +27,6 @@ export default { ...@@ -27,8 +27,6 @@ export default {
return this.adminUserPath.replace('id', this.user.username); return this.adminUserPath.replace('id', this.user.username);
}, },
adminUserMailto() { adminUserMailto() {
// NOTE: 'mailto:' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives
// eslint-disable-next-line @gitlab/require-i18n-strings
return `mailto:${this.user.email}`; return `mailto:${this.user.email}`;
}, },
userNoteShort() { userNoteShort() {
......
...@@ -72,8 +72,6 @@ export default { ...@@ -72,8 +72,6 @@ export default {
return this.author.id ? this.author.id : ''; return this.author.id ? this.author.id : '';
}, },
authorUrl() { authorUrl() {
// name: 'mailto:' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives
// eslint-disable-next-line @gitlab/require-i18n-strings
return this.author.web_url || `mailto:${this.commit.author_email}`; return this.author.web_url || `mailto:${this.commit.author_email}`;
}, },
authorAvatar() { authorAvatar() {
......
...@@ -22,7 +22,6 @@ export default { ...@@ -22,7 +22,6 @@ export default {
return this.commit?.message; return this.commit?.message;
}, },
commitAuthorPath() { commitAuthorPath() {
// eslint-disable-next-line @gitlab/require-i18n-strings
return this.commit?.author?.path || `mailto:${escape(this.commit?.authorEmail)}`; return this.commit?.author?.path || `mailto:${escape(this.commit?.authorEmail)}`;
}, },
commitAuthorAvatar() { commitAuthorAvatar() {
......
...@@ -65,7 +65,6 @@ export default { ...@@ -65,7 +65,6 @@ export default {
const body = sprintf(__('Enter the %{name} description'), { const body = sprintf(__('Enter the %{name} description'), {
name: this.issuableName, name: this.issuableName,
}); });
// eslint-disable-next-line @gitlab/require-i18n-strings
return `mailto:${this.email}?subject=${subject}&body=${body}`; return `mailto:${this.email}?subject=${subject}&body=${body}`;
}, },
}, },
......
...@@ -950,10 +950,10 @@ ...@@ -950,10 +950,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e" resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e"
integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg== integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg==
"@gitlab/eslint-plugin@10.0.0": "@gitlab/eslint-plugin@11.0.0":
version "10.0.0" version "11.0.0"
resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-10.0.0.tgz#83430fb4d0a2467bb54975d0b5b9dc8016005722" resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-11.0.0.tgz#90d71bc0c5f54ac066faba8c6f909b0df761d0bb"
integrity sha512-frCYzjQQaZ5kW1on3XwuVGhvYa6XjD6Q1POTbxDpzl6tNxSeTwOJohC6Joyw76e0Kw4fPQd/fHAfKQAB0AVQ7A== integrity sha512-5t1eTu/+myitEP68ceKQRRE0S5R1QStlRVykivZFZDxGloCyAq1zE96ZwqsMzDtpfK5fmf1+7yxGw9CPdLUB/A==
dependencies: dependencies:
babel-eslint "^10.0.3" babel-eslint "^10.0.3"
eslint-config-airbnb-base "^14.2.1" eslint-config-airbnb-base "^14.2.1"
......
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