Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		2018-08-17 17:43:54 +02:00
..
admin	…
concerns	…
form	…
web	…
account.rb	…
account_domain_block.rb	…
account_filter.rb	…
account_moderation_note.rb	…
account_pin.rb	…
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	Show exact number of followers/statuses on export page/in tooltip (#8199)	2018-08-14 21:56:17 +02:00
favourite.rb	Move status counters to separate table, count replies (#8104)	2018-08-14 19:19:32 +02:00
feed.rb	…
follow.rb	Implement Undo { Accept { Follow } } (fixes #8234) (#8245)	2018-08-17 16:24:56 +02:00
follow_request.rb	…
home_feed.rb	…
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	…
mention.rb	…
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	…
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-08-17 17:43:54 +02:00
status_pin.rb	…
status_stat.rb	Move status counters to separate table, count replies (#8104)	2018-08-14 19:19:32 +02:00
stream_entry.rb	…
subscription.rb	…
tag.rb	…
trending_tags.rb	…
user.rb	…
web.rb	…