Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
This commit is contained in:
Thibaut Girka 2019-03-26 16:02:54 +01:00
commit b9f314bba7
161 changed files with 5988 additions and 2055 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/directories_controller.rb
View file

@ -37,7 +37,7 @@ class DirectoriesController < ApplicationController
end
def set_accounts
@accounts = Account.discoverable.page(params[:page]).per(40).tap do |query|
@accounts = Account.discoverable.by_recent_status.page(params[:page]).per(40).tap do |query|
query.merge!(Account.tagged_with(@tag.id)) if @tag
end
end