diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-18 18:48:12 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-18 18:48:12 -0500 |
| commit | 16d5217502a09132dc14a3a808036af5dbcb73dd (patch) | |
| tree | deb7b81919e5f8082b7d848b0b8df4787d37f001 /app/controllers/stream_entries_controller.rb | |
| parent | 813da6788e5129579db04e89aac3076902af2c7a (diff) | |
| parent | ff87d1bc3ecdb81ff5c523f0964ecf223a503d30 (diff) | |
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
Diffstat (limited to 'app/controllers/stream_entries_controller.rb')
| -rw-r--r-- | app/controllers/stream_entries_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb index e2ea45c83..44e9c0bb8 100644 --- a/app/controllers/stream_entries_controller.rb +++ b/app/controllers/stream_entries_controller.rb @@ -16,8 +16,7 @@ class StreamEntriesController < ApplicationController respond_to do |format| format.html do use_pack 'public' - @ancestors = @stream_entry.activity.reply? ? cache_collection(@stream_entry.activity.ancestors(current_account), Status) : [] - @descendants = cache_collection(@stream_entry.activity.descendants(current_account), Status) + redirect_to short_account_status_url(params[:account_username], @stream_entry.activity) if @type == 'status' end format.atom do |