diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-09-30 00:29:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-30 00:29:38 +0200 |
commit | 5e36c3b44c052afb1aa61e2405c595c726bc9503 (patch) | |
tree | 899cb5f54098d08f28dad2c8ee555b3557dead16 /lib/paperclip/url_generator_extensions.rb | |
parent | 00889b313176308018d66e54b5cb7dcc92da1587 (diff) | |
parent | 29b5c5f4830f9bda0af352b1d6ac73830a6cfd4e (diff) |
Merge pull request #1612 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/paperclip/url_generator_extensions.rb')
-rw-r--r-- | lib/paperclip/url_generator_extensions.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/paperclip/url_generator_extensions.rb b/lib/paperclip/url_generator_extensions.rb index e1d6df2c2..a2cf5929a 100644 --- a/lib/paperclip/url_generator_extensions.rb +++ b/lib/paperclip/url_generator_extensions.rb @@ -2,16 +2,6 @@ module Paperclip module UrlGeneratorExtensions - # Monkey-patch Paperclip to use Addressable::URI's normalization instead - # of the long-deprecated URI.esacpe - def escape_url(url) - if url.respond_to?(:escape) - url.escape - else - Addressable::URI.parse(url).normalize.to_str.gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" } - end - end - def for_as_default(style_name) attachment_options[:interpolator].interpolate(default_url, @attachment, style_name) end |