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

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

Browse Source 
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
This commit is contained in:
Thibaut Girka
2020-01-04 22:54:06 +01:00
parent 22daf24600 2ecc7802ca
commit 01eaeab56d
72 changed files with 708 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/statuses/embed.html.haml
View File

@@ -1,3 +1,2 @@
- cache @status do
.activity-stream.activity-stream--headless
= render 'status', status: @status, centered: true, autoplay: @autoplay
.activity-stream.activity-stream--headless
= render 'status', status: @status, centered: true, autoplay: @autoplay