Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-25 15:17:21 +00:00
parent 995b59526b 85a395fab6
commit 837b3804bf
128 changed files with 1274 additions and 1030 deletions
@@ -60,9 +60,9 @@ module JsonLdHelper
  end

  def fetch_resource_without_id_validation(uri)
-    response = build_request(uri).perform
-    return if response.code != 200
-    body_to_json(response.to_s)
+    build_request(uri).perform do |response|
+      response.code == 200 ? body_to_json(response.to_s) : nil
+    end
  end

  def body_to_json(body)