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	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
form	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
web
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
account_domain_block.rb
account_filter.rb
account_moderation_note.rb
account_pin.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02: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	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	Lists (#5703)	2017-11-18 00:16:48 +01:00
follow.rb	Implement Undo { Accept { Follow } } (fixes #8234) (#8245)	2018-08-17 16:24:56 +02:00
follow_request.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160)	2018-05-04 21:14:34 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
mention.rb
mute.rb
notification.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
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	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
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	Fix number of results returned from TrendingTags.get	2018-07-16 19:54:14 +02:00
user.rb
web.rb