0
0
Fork 0

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

Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
This commit is contained in:
Thibaut Girka 2018-08-31 19:10:57 +02:00
commit 6f75a9001f
57 changed files with 1292 additions and 424 deletions

View file

@ -60,6 +60,7 @@ class StatusesController < ApplicationController
skip_session!
expires_in 180, public: true
response.headers['X-Frame-Options'] = 'ALLOWALL'
@autoplay = ActiveModel::Type::Boolean.new.cast(params[:autoplay])
render 'stream_entries/embed', layout: 'embedded'
end