David Yip e931cf656d Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions ... Conflicts: app/models/glitch/keyword_mute.rb		2018-06-12 16:39:30 -05: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	Ensure push subscription is immediately removed when application is revoked (#7548)	2018-05-19 21:05:08 +02:00
account.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05: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	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb
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
glitch.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
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
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	Track trending tags (#7638)	2018-05-27 21:45:30 +02:00
trending_tags.rb	Remove trending hashtags (#7711)	2018-06-04 02:18:18 +02:00
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-27 13:20:15 +02:00
web.rb