From fe6b965fd5d9e2f3d7f346b53f6762ce5433e402 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 24 Sep 2019 15:42:02 +0000 Subject: [PATCH] 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 --- .rubocop_todo.yml | 1 - config/initializers/10-patches.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 043c4864e..ac5bd3574 100644 --- 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 e0559903b..9af59563e 100644 --- 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