diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:45 +0000 |
commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
tree | b6505abedcd965ebae5118b504b185b63129dc4c /.eslintrc.yml | |
parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) | |
download | gitlab-ce-aaf59610548d9b0fd01acfd50e831cbe519ecba2.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.eslintrc.yml')
-rw-r--r-- | .eslintrc.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.eslintrc.yml b/.eslintrc.yml index 8d34efc9a6b..0639228fe51 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -1,6 +1,6 @@ extends: - - '@gitlab' - - plugin:promise/recommended + - plugin:@gitlab/default + - plugin:@gitlab/i18n - plugin:no-jquery/slim - plugin:no-jquery/deprecated-3.4 globals: @@ -16,9 +16,6 @@ settings: webpack: config: './config/webpack.config.js' rules: - "@gitlab/i18n/no-non-i18n-strings": error - "@gitlab/vue-i18n/no-bare-strings": error - "@gitlab/vue-i18n/no-bare-attribute-strings": error import/no-commonjs: error no-underscore-dangle: - error @@ -54,4 +51,4 @@ overrides: - files: - '**/spec/**/*' rules: - "@gitlab/i18n/no-non-i18n-strings": off + "@gitlab/require-i18n-strings": off |