tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
This commit is contained in:
David Yip
2018-04-18 18:48:12 -05:00
parent 813da6788e ff87d1bc3e
commit 16d5217502
124 changed files with 2089 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/stream_entries_controller.rb
View File

@@ -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