1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00

Typo in method names: s/trailling/trailing/ (#37586).

git-svn-id: https://svn.redmine.org/redmine/trunk@21785 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2022-08-28 07:32:24 +00:00
parent 54f281fef9
commit c7c24cb6e2
3 changed files with 16 additions and 6 deletions

View File

@ -161,21 +161,31 @@ module Redmine
path.start_with?('/') ? path : "/#{path}"
end
def with_trailling_slash(path)
def with_trailing_slash(path)
path ||= ''
path.end_with?('/') ? path : "#{path}/"
end
def with_trailling_slash(path)
ActiveSupport::Deprecation.warn 'Redmine::Scm::Adapters::AbstractAdapter#with_trailling_slash is deprecated and will be removed in Redmine 6.0. Please use #with_trailing_slash instead.'
with_trailing_slash(path)
end
def without_leading_slash(path)
path ||= ''
path.gsub(%r{^/+}, '')
end
def without_trailling_slash(path)
def without_trailing_slash(path)
path ||= ''
path.end_with?('/') ? path[0..-2] : path
end
def without_trailling_slash(path)
ActiveSupport::Deprecation.warn 'Redmine::Scm::Adapters::AbstractAdapter#without_trailling_slash is deprecated and will be removed in Redmine 6.0. Please use #without_trailing_slash instead.'
without_trailing_slash(path)
end
def valid_name?(name)
return true if name.nil?
return true if name.is_a?(Integer) && name > 0

View File

@ -35,7 +35,7 @@ module Redmine
def initialize(url, root_url=nil, login=nil, password=nil,
path_encoding=nil)
@url = with_trailling_slash(url)
@url = with_trailing_slash(url)
@path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
end
@ -46,8 +46,8 @@ module Redmine
def format_path_ends(path, leading=true, trailling=true)
path = leading ? with_leading_slash(path) :
without_leading_slash(path)
trailling ? with_trailling_slash(path) :
without_trailling_slash(path)
trailling ? with_trailing_slash(path) :
without_trailing_slash(path)
end
def info

View File

@ -154,7 +154,7 @@ module Redmine
# do nothing
end
end
path_prefix = path.blank? ? '' : with_trailling_slash(path)
path_prefix = path.blank? ? '' : with_trailing_slash(path)
entries = Entries.new
as_ary(manifest['dir']).each do |e|