From 983a0bba5d2a042c4a3bbb22432ec192c7501d82 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Apr 2020 18:38:24 +0000
Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee

---
 .rubocop.yml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index a5f7f5dd45a..c98d027cee3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -25,8 +25,15 @@ AllCops:
     - 'generator_templates/**/*'
     - 'builds/**/*'
     - 'plugins/**/*'
+    - 'file_hooks/**/*'
   CacheRootDirectory: tmp
 
+Cop/StaticTranslationDefinition:
+  Enabled: true
+  Exclude:
+    - 'spec/**/*'
+    - 'ee/spec/**/*'
+
 # This cop checks whether some constant value isn't a
 # mutable literal (e.g. array or hash).
 Style/MutableConstant:
-- 
cgit v1.2.1