diff options
| -rw-r--r-- | .rubocop_todo.yml | 1 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 876870e1b..b0350ddb7 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -325,7 +325,6 @@ Layout/SpaceInsideParens: - 'lib/redmine/scm/adapters/abstract_adapter.rb' - 'lib/redmine/scm/adapters/cvs_adapter.rb' - 'lib/redmine/scm/adapters/git_adapter.rb' - - 'lib/redmine/scm/adapters/mercurial_adapter.rb' - 'lib/redmine/sudo_mode.rb' - 'lib/redmine/wiki_formatting/textile/formatter.rb' - 'lib/redmine/wiki_formatting/textile/redcloth3.rb' diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index ce6f1daf9..82a773224 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -206,7 +206,7 @@ module Redmine end cpmap = Hash[*cpalist.flatten] paths = as_ary(le['paths']['path']).map do |e| - p = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['__content__']) ) + p = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['__content__'])) {:action => e['action'], :path => with_leading_slash(p), :from_path => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil), |