Merge branch 'pl-add-rubocop-manual-todo-rules' into 'master'

Add .rubocop_manual_todo.yml to code patterns See merge request gitlab-org/gitlab!47553

Merge branch 'pl-add-rubocop-manual-todo-rules' into 'master'
Add .rubocop_manual_todo.yml to code patterns See merge request gitlab-org/gitlab!47553
fd0d447c · Jan Provaznik · b92d072b · 6cff5282 · fd0d447c
Commit fd0d447c authored Nov 13, 2020 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

.gitlab/ci/rules.gitlab-ci.yml .gitlab/ci/rules.gitlab-ci.yml +4 -4

No files found.
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -164,7 +164,7 @@
  - "vendor/assets/**/*"
  - ".gitlab/ci/**/*"
  - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
-  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
+  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo,scss-lint}.yml"
  - "*_VERSION"
  - "Gemfile{,.lock}"
  - "Rakefile"
@@ -186,7 +186,7 @@
  - "vendor/assets/**/*"
  - ".gitlab/ci/**/*"
  - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
-  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
+  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo,scss-lint}.yml"
  - "*_VERSION"
  - "Gemfile{,.lock}"
  - "Rakefile"
@@ -210,7 +210,7 @@
  - "vendor/assets/**/*"
  - ".gitlab/ci/**/*"
  - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
-  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
+  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo,scss-lint}.yml"
  - "*_VERSION"
  - "Gemfile{,.lock}"
  - "Rakefile"
@@ -231,7 +231,7 @@
  - "vendor/assets/**/*"
  - ".gitlab/ci/**/*"
  - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}"
-  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,scss-lint}.yml"
+  - ".{codeclimate,eslintrc,gitlab-ci,haml-lint,haml-lint_todo,rubocop,rubocop_todo,rubocop_manual_todo,scss-lint}.yml"
  - "*_VERSION"
  - "Gemfile{,.lock}"
  - "Rakefile"