diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:26:47 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:26:47 -0500 |
commit | f61aa8e0f7101b5b7510a3809c94b7083ba08329 (patch) | |
tree | 3677a21fdbd4174125495e3545c527e8aff47297 /app/services/fetch_link_card_service.rb | |
parent | 6af17b79c57b95a39fb4ed325aeff3edf02162ea (diff) | |
parent | 40e5d2303ba1edc51beae66cc15263675980106a (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb
Diffstat (limited to 'app/services/fetch_link_card_service.rb')
-rw-r--r-- | app/services/fetch_link_card_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index 26deb5ecc..d5920a417 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -45,7 +45,7 @@ class FetchLinkCardService < BaseService Request.new(:get, @url).perform do |res| if res.code == 200 && res.mime_type == 'text/html' - @html = res.to_s + @html = res.body_with_limit @html_charset = res.charset else @html = nil |