From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 24 Sep 2019 15:41:39 +0000 (+0000)
Subject: code cleanup: rubocop: fix Rails/Presence in lib/redmine/scm/adapters/cvs_adapter.rb
X-Git-Tag: 4.1.0~562
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=947fdf100da845f1ae12c6176a4ae7bb96e0c693;p=redmine.git

code cleanup: rubocop: fix Rails/Presence in lib/redmine/scm/adapters/cvs_adapter.rb

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b78696694..1c9f5bff0 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -965,7 +965,6 @@ Rails/Presence:
     - 'lib/redmine/codeset_util.rb'
     - 'lib/redmine/i18n.rb'
     - 'lib/redmine/scm/adapters/abstract_adapter.rb'
-    - 'lib/redmine/scm/adapters/cvs_adapter.rb'
     - 'lib/redmine/scm/adapters/filesystem_adapter.rb'
     - 'lib/redmine/scm/adapters/git_adapter.rb'
     - 'lib/redmine/scm/adapters/mercurial_adapter.rb'
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 6c6627935..e0a8cd4d8 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -63,7 +63,7 @@ module Redmine
         #  password -> unnecessary too
         def initialize(url, root_url=nil, login=nil, password=nil,
                        path_encoding=nil)
-          @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+          @path_encoding = path_encoding.presence || 'UTF-8'
           @url      = url
           # TODO: better Exception here (IllegalArgumentException)
           raise CommandFailed if root_url.blank?