code cleanup: rubocop: fix Rails/Presence in db/migrate/20110228000100_copy_repositor...

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1c9f5bff0a8240afcdeb0f9ba4fd7dd066470988..043c4864ed613ece4fe354a486ed7b8dcbbf8232 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -961,7 +961,6 @@ Rails/Presence:
     - 'app/models/repository.rb'
     - 'config/initializers/10-patches.rb'
     - 'config/initializers/30-redmine.rb'
-    - 'db/migrate/20110228000100_copy_repositories_log_encoding.rb'
     - 'lib/redmine/codeset_util.rb'
     - 'lib/redmine/i18n.rb'
     - 'lib/redmine/scm/adapters/abstract_adapter.rb'

diff --git a/db/migrate/20110228000100_copy_repositories_log_encoding.rb b/db/migrate/20110228000100_copy_repositories_log_encoding.rb
index df9c3dca5292863ebb9387f2fd0a5dff95f064f3..1648bf725f504d40131360fe1952969b1ecec91d 100644 (file)
--- a/db/migrate/20110228000100_copy_repositories_log_encoding.rb
+++ b/db/migrate/20110228000100_copy_repositories_log_encoding.rb
@@ -1,7 +1,7 @@
 class CopyRepositoriesLogEncoding < ActiveRecord::Migration[4.2]
   def self.up
     encoding = Setting.commit_logs_encoding.to_s.strip
-    encoding = encoding.blank? ? 'UTF-8' : encoding
+    encoding = encoding.presence || 'UTF-8'
     # encoding is NULL by default
     Repository.where("type IN ('Bazaar', 'Cvs', 'Darcs')").
                  update_all(["log_encoding = ?", encoding])