Update RuboCop Rails to 2.13 (#35207).

git-svn-id: http://svn.redmine.org/redmine/trunk@21332 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop.yml b/.rubocop.yml
index 328d60cf7bb835a05c3e2f1338df0ae80ce6c47b..b1badb42cd95788a0369288a73daa5b90cc432ef 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -118,6 +118,9 @@ Rails/BulkChangeTable:
     - 'db/migrate/20120714122200_add_workflows_rule_fields.rb'
     - 'db/migrate/20131214094309_remove_custom_fields_min_max_length_default_values.rb'
 
+Rails/CompactBlank:
+  Enabled: false
+
 Rails/EnvironmentVariableAccess:
   Enabled: false
 

diff --git a/Gemfile b/Gemfile
index 87a8c625371e2dcfab39e9812f5a8b4427cca6a7..a58c17e7f67bbfef4b26fc1cf9ecbb463dd90109 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ group :test do
   # RuboCop
   gem 'rubocop', '~> 1.24.0'
   gem 'rubocop-performance', '~> 1.13.0'
-  gem 'rubocop-rails', '~> 2.12.4'
+  gem 'rubocop-rails', '~> 2.13.0'
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")