summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-22 11:30:54 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-22 11:30:54 +0000
commit27dbbee75e9633ab1f597087eab2356c94ded2b0 (patch)
tree7e22052158d02c6f5ee04788614f184554d49fa3
parente57b7fd4c0fb0d45de7023531cb63796c07c59dc (diff)
downloadredmine-27dbbee75e9633ab1f597087eab2356c94ded2b0.tar.gz
redmine-27dbbee75e9633ab1f597087eab2356c94ded2b0.zip
code cleanup: rubocop: fix Style/UnneededInterpolation in lib/redmine/scm/adapters/git_adapter.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@18796 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--.rubocop_todo.yml1
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb4
2 files changed, 2 insertions, 3 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 93f45b94c..89f874f5a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1408,7 +1408,6 @@ Style/UnneededInterpolation:
- 'app/views/common/feed.atom.builder'
- 'app/views/journals/index.builder'
- 'lib/redmine/helpers/time_report.rb'
- - 'lib/redmine/scm/adapters/git_adapter.rb'
- 'lib/redmine/scm/adapters/subversion_adapter.rb'
- 'lib/redmine/wiki_formatting.rb'
- 'test/functional/versions_controller_test.rb'
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 1c0c98699..ee02e5146 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -199,7 +199,7 @@ module Redmine
cmd_args = %w|log --no-color --encoding=UTF-8 --raw --date=iso --pretty=fuller --parents --stdin|
cmd_args << '--no-renames' if self.class.client_version_above?([2, 9])
cmd_args << "--reverse" if options[:reverse]
- cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit]
+ cmd_args << "-n" << options[:limit].to_i.to_s if options[:limit]
cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty?
revisions = []
if identifier_from || identifier_to
@@ -210,7 +210,7 @@ module Redmine
end
if identifier_to
git_identifier_to = scm_iconv(@path_encoding, 'UTF-8', identifier_to)
- revisions[0] << "#{git_identifier_to}" if identifier_to
+ revisions[0] << git_identifier_to.to_s if identifier_to
end
else
unless options[:includes].blank?