Merge d41258bb90 into 30ba7b133b

2018-03-30 13:46:28 +00:00 · 2018-03-30 13:46:28 +00:00 · 81f9b72447
commit 81f9b72447
parent 30ba7b133b d41258bb90
2 changed files with 10 additions and 0 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -3,6 +3,7 @@ inherit_from: .rubocop_todo.yml

 # Apply rule to all cops
 AllCops:
+  TargetRubyVersion: 2.4
  Include:
    - '**/Rakefile'
    - '**/config.ru'
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -710,3 +710,12 @@ Style/TrailingCommaInLiteral:
    - 'Guardfile'
    - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
    - 'spec/models/conference_spec.rb'
+
+
+# for ruby 3.0
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false
+Style/SafeNavigation:
+  Enabled: false