summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-09-01 19:50:45 +0200
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-09-01 19:50:45 +0200
commit9a10c0a8d542df2db2e75c230bf116bed421f8d5 (patch)
tree282afdafe490627ab70ac27e66d8ccfd3c30c573
parent1c4e866348e0c782d2e5374209508785ac812c7a (diff)
downloadgitlab-ce-9a10c0a8d542df2db2e75c230bf116bed421f8d5.tar.gz
Rubocop syntax 2.3
-rw-r--r--.rubocop.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 282f4539f03..5bd31ccf329 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,8 +5,8 @@ require:
inherit_from: .rubocop_todo.yml
AllCops:
- TargetRubyVersion: 2.1
- # Cop names are not displayed in offense messages by default. Change behavior
+ TargetRubyVersion: 2.3
+ # Cop names are not d§splayed in offense messages by default. Change behavior
# by overriding DisplayCopNames, or by giving the -D/--display-cop-names
# option.
DisplayCopNames: true
@@ -192,6 +192,9 @@ Style/FlipFlop:
Style/For:
Enabled: true
+# Checks if there is a magic comment to enforce string literals
+Style/FrozenStringLiteralComment:
+ Enabled: false
# Do not introduce global variables.
Style/GlobalVars:
Enabled: true