diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2c57aaa84..729c60209 100644 --- 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 f827b8cba..0bbfdfb53 100644 --- 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],