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/helpers | |
| 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/helpers')
| -rw-r--r-- | app/helpers/jsonld_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb index 957a2cbc9..dfb8fcb8b 100644 --- a/app/helpers/jsonld_helper.rb +++ b/app/helpers/jsonld_helper.rb @@ -61,7 +61,7 @@ module JsonLdHelper def fetch_resource_without_id_validation(uri) build_request(uri).perform do |response| - response.code == 200 ? body_to_json(response.to_s) : nil + response.code == 200 ? body_to_json(response.body_with_limit) : nil end end |