Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - config/locales/simple_form.pl.yml
2019-01-16 14:20:07 +01:00
parent 077639c274 5363c724fc
commit dbe311f0e9
51 changed files with 1065 additions and 275 deletions
--- a/app/services/fetch_oembed_service.rb
+++ b/app/services/fetch_oembed_service.rb
@@ -43,7 +43,7 @@ class FetchOEmbedService
      res.code != 200 ? nil : res.body_with_limit
    end

-    validate(parse_for_format(body)) unless body.nil?
+    validate(parse_for_format(body)) if body.present?
  rescue Oj::ParseError, Ox::ParseError
    nil
  end