diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 15:23:57 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 15:23:57 +0200 |
commit | 00fcdebed758f031b486ec239fd425fc54a180b3 (patch) | |
tree | 1211e136ba3e886ee8daaa5200babffc42375dd1 /config/initializers/open_uri_redirection.rb | |
parent | a9e8f98a9d32c57956d41009bd09a1f33310676e (diff) | |
parent | 028ad4124cf1fdb28f5cf11bd7080e7a63f2f99e (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
Diffstat (limited to 'config/initializers/open_uri_redirection.rb')
-rw-r--r-- | config/initializers/open_uri_redirection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/open_uri_redirection.rb b/config/initializers/open_uri_redirection.rb index e24fdecab..ea2dcffea 100644 --- a/config/initializers/open_uri_redirection.rb +++ b/config/initializers/open_uri_redirection.rb @@ -1,7 +1,7 @@ require 'open-uri' module OpenURI - def OpenURI.redirectable?(uri1, uri2) # :nodoc: + def self.redirectable?(uri1, uri2) # :nodoc: uri1.scheme.downcase == uri2.scheme.downcase || (/\A(?:http|https|ftp)\z/i =~ uri1.scheme && /\A(?:http|https|ftp)\z/i =~ uri2.scheme) end |