Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…		2018-06-15 20:51:39 +02:00
..
admin
concerns	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-06-07 05:13:49 -05:00
form
glitch	Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions	2018-06-12 16:39:30 -05:00
web	Fix has_one association on Web::PushSubscription (#7767)	2018-06-09 21:11:14 +02:00
account.rb
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
domain_block.rb
email_domain_block.rb
export.rb
favourite.rb
feed.rb
follow.rb
follow_request.rb
glitch.rb
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb	Add autofollow option to invites (#7805)	2018-06-15 18:00:23 +02:00
invite_filter.rb	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
list.rb
list_account.rb
list_feed.rb
media_attachment.rb
mention.rb
mute.rb
notification.rb
preview_card.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 remote-tracking branch 'tootsuite/master' into merge-upstream	2018-06-07 05:13:49 -05:00
status_pin.rb
stream_entry.rb
subscription.rb
tag.rb
trending_tags.rb
user.rb
web.rb