Remove commented-out dead code and fix RuboCop offense Layout/LeadingCommentSpace...

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cdd5ade40c256ed86310d004ac08fee1509a6b29..84baf94e13bafe728179a5905150b474c10eea0a 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -84,12 +84,6 @@ Layout/IndentationWidth:
     - 'db/migrate/20120115143126_set_default_repositories.rb'
     - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
-Layout/LeadingCommentSpace:
-  Exclude:
-    - 'lib/redmine/scm/adapters/cvs_adapter.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented

diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 2f157d10bb9351f35aae2f30654599f8150c4a49..92bae7a064a2a64e236df010b5b6b842d051f8ef 100644 (file)
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -113,7 +113,6 @@ module Redmine
                   Entry.new(
                     {
                       :name => scm_iconv('UTF-8', @path_encoding, fields[-5]),
-                      #:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]),
                       :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[-5]}"),
                       :kind => 'file',
                       :size => nil,