code cleanup: rubocop: fix Rails/Presence in config/initializers/10-patches.rb

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 043c4864ed613ece4fe354a486ed7b8dcbbf8232..ac5bd35744179545321d1424b57bd8bee6ca7b41 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -959,7 +959,6 @@ Rails/Presence:
     - 'app/controllers/activities_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/models/repository.rb'
-    - 'config/initializers/10-patches.rb'
     - 'config/initializers/30-redmine.rb'
     - 'lib/redmine/codeset_util.rb'
     - 'lib/redmine/i18n.rb'

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index e0559903b21618d8a235b3d3ca7bbdb25b4f3106..9af59563e098cdb54297079a421bdccb1ab9ccd1 100644 (file)
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -97,7 +97,7 @@ module ActionView
       alias :options_for_select_without_non_empty_blank_option :options_for_select
       def options_for_select(container, selected = nil)
         if container.is_a?(Array)
-          container = container.map {|element| element.blank? ? [" ".html_safe, ""] : element}
+          container = container.map {|element| element.presence || [" ".html_safe, ""]}
         end
         options_for_select_without_non_empty_blank_option(container, selected)
       end