Fixing image upload limits, allowing webm, merge/unmerge events trigger

timeline reload in UI, other small fixes
2016-09-12 18:22:43 +02:00
parent 3d566279cb
commit ce29624c6d
15 changed files with 144 additions and 61 deletions
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@ -30,6 +30,7 @@ class FollowService < BaseService
    end

    FeedManager.instance.trim(:home, into_account.id)
+    FeedManager.instance.broadcast(into_account.id, type: 'merge')
  end

  def redis