Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		2018-09-03 14:33:06 +02:00
..
admin	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
concerns
form
web
account.rb
account_domain_block.rb
account_filter.rb
account_moderation_note.rb
account_pin.rb	Add API endpoint to list featured accounts (fixes #8315) (#8317)	2018-08-20 18:46:04 +02:00
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
conversation.rb
conversation_mute.rb
custom_emoji.rb	Add entity cache (#7271)	2018-04-27 01:38:10 +02:00
custom_emoji_filter.rb
custom_filter.rb
domain_block.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
email_domain_block.rb
export.rb
favourite.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
instance.rb	Add Instance class to list admin records (#3443)	2017-05-31 20:38:44 +02:00
instance_filter.rb
invite.rb
invite_filter.rb
list.rb
list_account.rb
list_feed.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
media_attachment.rb
mention.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
mute.rb
notification.rb
preview_card.rb
relay.rb	Expect relays to answer with accept/reject (#8179)	2018-08-13 18:17:20 +02:00
remote_follow.rb
remote_profile.rb	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	2018-04-01 23:55:42 +02:00
report.rb
report_filter.rb
report_note.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
status.rb
status_pin.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
status_stat.rb
stream_entry.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
subscription.rb
tag.rb
trending_tags.rb
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-03 14:33:06 +02:00
web.rb