Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' of https://github.com/tootsuite/mastodon

Browse source 
# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb
This commit is contained in:
imncls 2018-02-23 23:28:31 +09:00
commit bb6988a7ac
No known key found for this signature in database
GPG key ID: 18FE1E1E7098294A
100 changed files with 1395 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/presenters/instance_presenter.rb
View file

@ -48,4 +48,8 @@ class InstancePresenter
def thumbnail
@thumbnail ||= Rails.cache.fetch('site_uploads/thumbnail') { SiteUpload.find_by(var: 'thumbnail') }
end
def hero
@hero ||= Rails.cache.fetch('site_uploads/hero') { SiteUpload.find_by(var: 'hero') }
end
end