Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json
2018-04-18 18:48:12 -05:00
parent 813da6788e ff87d1bc3e
commit 16d5217502
124 changed files with 2089 additions and 995 deletions
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@ -18,7 +18,7 @@ class StatusPolicy < ApplicationPolicy
  end

  def reblog?
-    !direct? && !private? && show?
+    !direct? && (!private? || owned?) && show?
  end

  def destroy?