Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

Ruby 2.7: Remove deprecated URI.escape/unescape (#32752).

Browse Source 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19455 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-01-23 23:28:34 +00:00
parent ba7d4745e2
commit 62fe933eed
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/redmine/field_format.rb
View File

@@ -269,15 +269,15 @@ module Redmine
# %m1%, %m2%... => capture groups matches of the custom field regexp if defined
def url_from_pattern(custom_field, value, customized)
url = custom_field.url_pattern.to_s.dup
url.gsub!('%value%') {URI.encode value.to_s}
url.gsub!('%id%') {URI.encode customized.id.to_s}
url.gsub!('%value%') {Addressable::URI.encode value.to_s}
url.gsub!('%id%') {Addressable::URI.encode customized.id.to_s}
url.gsub!('%project_id%') {
URI.encode(
Addressable::URI.encode(
(customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s
)
}
url.gsub!('%project_identifier%') {
URI.encode(
Addressable::URI.encode(
(customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s
)
}
@@ -285,7 +285,7 @@ module Redmine
url.gsub!(%r{%m(\d+)%}) do
m = $1.to_i
if matches ||= value.to_s.match(Regexp.new(custom_field.regexp))
URI.encode matches[m].to_s
Addressable::URI.encode matches[m].to_s
end
end
end

4
lib/redmine/scm/adapters/subversion_adapter.rb
View File

@@ -108,7 +108,7 @@ module Redmine
next if entry['kind'] == 'dir' && commit_date.nil?
name = entry['name']['__content__']
entries << Entry.new({:name => URI.unescape(name),
entries << Entry.new({:name => CGI.unescape(name),
:path => ((path.empty? ? "" : "#{path}/") + name),
:kind => entry['kind'],
:size => ((s = entry['size']) ? s['__content__'].to_i : nil),
@@ -289,7 +289,7 @@ module Redmine
def target(path = '')
base = /^\//.match?(path) ? root_url : url
uri = "#{base}/#{path}"
uri = URI.escape(URI.escape(uri), '[]')
uri = Addressable::URI.encode(uri)
shell_quote(uri.gsub(/[?<>\*]/, ''))
end
end