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

2018-10-28 08:37:49 +01:00
parent 008f98b304 26fe37c414
commit b00f60f1d3
44 changed files with 267 additions and 256 deletions
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -63,6 +63,7 @@ class FetchLinkCardService < BaseService

  def attach_card
    @status.preview_cards << @card
+    Rails.cache.delete(@status)
  end

  def parse_urls