Thibaut Girka 5f1bdca4c8 Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream ... Merge upstream changes right before the public profile redesign.		2018-07-30 14:39:06 +02:00
..
admin	…
concerns	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
form	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
web	Fix has_one association on Web::PushSubscription (#7767)	2018-06-09 21:11:14 +02:00
account.rb	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
account_domain_block.rb	…
account_filter.rb	…
account_moderation_note.rb	…
admin.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	Thread scopes through #matches?. #454.	2018-06-03 23:00:50 -05:00
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	2018-07-09 02:22:09 +02:00
domain_block.rb	…
email_domain_block.rb	…
export.rb	…
favourite.rb	Improve counter caches on Status and Account (#7644)	2018-05-30 02:50:23 +02:00
feed.rb	…
follow.rb	…
follow_request.rb	…
home_feed.rb	…
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +02:00
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream	2018-07-30 14:39:06 +02:00
mention.rb	…
mute.rb	…
notification.rb	…
preview_card.rb	…
relay.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
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-06-21 20:49:57 +02:00
status_pin.rb	…
stream_entry.rb	…
subscription.rb	…
tag.rb	…
trending_tags.rb	Fix number of results returned from TrendingTags.get	2018-07-16 19:54:14 +02:00
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
web.rb	…