Disable RuboCop Lint/InterpolationCheck for USER_FORMATS in app/models/user.rb (...

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2c57aaa84eaab92e64e81e59743acaec3f767600..729c602091808b4b894944a43980bb2a8f449ac7 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -202,11 +202,6 @@ Lint/FloatComparison:
   Exclude:
     - 'test/system/timelog_test.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Lint/InterpolationCheck:
-  Exclude:
-    - 'app/models/user.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/Loop:
   Exclude:

diff --git a/app/models/user.rb b/app/models/user.rb
index f827b8cba4676d3cf945f3684a6657d1330ad8f9..0bbfdfb53e68349764a52581889d445b254c0db3 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,6 +24,7 @@ class User < Principal
   include Redmine::SafeAttributes
 
   # Different ways of displaying/sorting users
+  # rubocop:disable Lint/InterpolationCheck
   USER_FORMATS = {
     :firstname_lastname => {
       :string => '#{firstname} #{lastname}',
@@ -71,6 +72,7 @@ class User < Principal
       :setting_order => 8
     },
   }
+  # rubocop:enable Lint/InterpolationCheck
 
   MAIL_NOTIFICATION_OPTIONS = [
     ['all', :label_user_mail_option_all],