From 87c9df29ce8835da5d68dbf3e59674bd4524ee96 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 22 Feb 2017 12:18:40 -0600
Subject: =?UTF-8?q?Don=E2=80=99t=20exclude=20some=20file=20in=20lib=20from?=
 =?UTF-8?q?=20rubocop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index e07282dd894..86f5df61724 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -22,13 +22,6 @@ AllCops:
     - 'db/fixtures/**/*'
     - 'tmp/**/*'
     - 'bin/**/*'
-    - 'lib/backup/**/*'
-    - 'lib/ci/backup/**/*'
-    - 'lib/tasks/**/*'
-    - 'lib/ci/migrate/**/*'
-    - 'lib/email_validator.rb'
-    - 'lib/gitlab/upgrader.rb'
-    - 'lib/gitlab/seeder.rb'
     - 'generator_templates/**/*'
 
 # Style #######################################################################
@@ -208,6 +201,9 @@ Style/FrozenStringLiteralComment:
 # Do not introduce global variables.
 Style/GlobalVars:
   Enabled: true
+  Exclude:
+    - 'lib/backup/**/*'
+    - 'lib/tasks/**/*'
 
 # Prefer Ruby 1.9 hash syntax `{ a: 1, b: 2 }`
 # over 1.8 syntax `{ :a => 1, :b => 2 }`.
@@ -780,6 +776,11 @@ Rails/HasAndBelongsToMany:
 # Checks for calls to puts, print, etc.
 Rails/Output:
   Enabled: true
+  Exclude:
+    - lib/gitlab/seeder.rb
+    - lib/gitlab/upgrader.rb
+    - 'lib/backup/**/*'
+    - 'lib/tasks/**/*'
 
 # Checks for incorrect grammar when using methods like `3.day.ago`.
 Rails/PluralizationGrammar:
@@ -971,3 +972,9 @@ Style/ConditionalAssignment:
 
 Style/DoubleNegation:
   Enabled: false
+
+Rails/Exit:
+  Enabled: true
+  Exclude:
+    - lib/gitlab/upgrader.rb
+    - 'lib/backup/**/*'
-- 
cgit v1.2.1