Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml
This commit is contained in:
@@ -18,7 +18,7 @@ module Remotable
|
||||
return
|
||||
end
|
||||
|
||||
return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[attribute_name] == url
|
||||
return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.blank? || self[attribute_name] == url
|
||||
|
||||
begin
|
||||
Request.new(:get, url).perform do |response|
|
||||
|
Reference in New Issue
Block a user