Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
This commit is contained in:
Thibaut Girka 2019-09-18 17:25:56 +02:00
commit 5cadb47238
180 changed files with 1537 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/presenters/instance_presenter.rb
View file

@ -33,7 +33,7 @@ class InstancePresenter
end
def sample_accounts
Rails.cache.fetch('sample_accounts', expires_in: 12.hours) { Account.discoverable.popular.limit(3) }
Rails.cache.fetch('sample_accounts', expires_in: 12.hours) { Account.local.discoverable.popular.limit(3) }
end
def version_number