summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-06-29 18:00:22 +0200
committerConnor Shea <connor.james.shea@gmail.com>2016-07-13 12:12:47 -0600
commitae6edf18fcf207a63a7130ec8d49966acd83de67 (patch)
tree2ae78f51d17b6396ffca861301ad5446c192e803 /.rubocop.yml
parent9b0ef1559f78e58b398e428763ff97dfdc53e186 (diff)
downloadgitlab-ce-ae6edf18fcf207a63a7130ec8d49966acd83de67.tar.gz
Update rubocop to 0.41.2
https://github.com/bbatsov/rubocop/blob/v0.41.2/CHANGELOG.md
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 3aac8401848..17802fbb307 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,6 +2,8 @@ require:
- rubocop-rspec
- ./rubocop/rubocop
+inherit_from: .rubocop_todo.yml
+
AllCops:
TargetRubyVersion: 2.1
# Cop names are not displayed in offense messages by default. Change behavior
@@ -159,10 +161,6 @@ Style/ConstantName:
Style/DefWithParentheses:
Enabled: true
-# Checks for use of deprecated Hash methods.
-Style/DeprecatedHashMethods:
- Enabled: false
-
# Document classes and non-namespace modules.
Style/Documentation:
Enabled: false