Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2015-05-04 16:48:54 +0300
committerDennis Schubert <mail@dennis-schubert.de>2015-05-07 23:55:35 +0300
commitfa24333ca19e70eba9150eab1547f2d89605dbf3 (patch)
tree409d5bf014fbcececfdcd2c51092069a66935bd1 /.rubocop.yml
parent5a6f6c68cc184d0101d1878f7124b79516de6458 (diff)
bump rubocop
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index e3ea0b991..2e55fe82e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -36,10 +36,8 @@ Style/AlignHash:
EnforcedColonStyle: table
# Mixing the styles looks just silly.
-# REVIEW: Enable once https://github.com/bbatsov/rubocop/commit/760ce1ed2cf10beda5e163f934c03a6fb6daa38e
-# is released.
-#Style/HashSyntax:
-# EnforcedStyle: ruby19_no_mixed_keys
+Style/HashSyntax:
+ EnforcedStyle: ruby19_no_mixed_keys
# has_key? and has_value? are far more readable than key? and value?
Style/DeprecatedHashMethods:
@@ -93,7 +91,7 @@ Style/SpaceInsideHashLiteralBraces:
# { ... } for multi-line blocks is okay, follow Weirichs rule instead:
# https://web.archive.org/web/20140221124509/http://onestepback.org/index.cgi/Tech/Ruby/BraceVsDoEnd.rdoc
-Style/Blocks:
+Style/BlockDelimiters:
Enabled: false
# do / end blocks should be used for side effects,