diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-01 19:51:34 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-01 19:51:34 +0000 |
| commit | aab00fa1bd0fe04278c2d5dc4737bbc730096985 (patch) | |
| tree | 1b77860ca1c61e6446f04ac364d000ef3042b3f8 | |
| parent | a9e28b3dfbbdaf4c0bba4cb5a4f7952ddca0a792 (diff) | |
| parent | 9a10c0a8d542df2db2e75c230bf116bed421f8d5 (diff) | |
| download | gitlab-ce-aab00fa1bd0fe04278c2d5dc4737bbc730096985.tar.gz | |
Merge branch 'zj-rubocop-ruby-2-3-syntax' into 'master'
Enable Ruby 2.3 for rubocop too
See merge request !6153
| -rw-r--r-- | .rubocop.yml | 7 |
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 |