Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
admin	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
form	…
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	…
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
account_tag_stat.rb	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
admin.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	…
domain_block.rb	…
email_domain_block.rb	…
export.rb	…
favourite.rb	…
feed.rb	…
follow.rb	…
follow_request.rb	…
home_feed.rb	…
identity.rb	Change identities id column to a bigint (#9371)	2018-11-27 13:56:25 +01:00
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
list.rb	Add database support for list show-reply preferences	2018-11-28 14:46:07 +01:00
list_account.rb	…
list_feed.rb	…
media_attachment.rb	…
mention.rb	…
mute.rb	…
notification.rb	…
preview_card.rb	…
relay.rb	…
remote_follow.rb	…
remote_profile.rb	…
report.rb	…
report_filter.rb	…
report_note.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
status_pin.rb	…
status_stat.rb	…
stream_entry.rb	…
subscription.rb	…
tag.rb	Cache hashtag sample accounts, and exclude ineligible ones (#9465)	2018-12-08 01:32:26 +01:00
trending_tags.rb	…
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
web.rb	…