Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		2018-07-09 07:13:59 +02:00
..
admin
concerns	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
form
glitch	keyword mute: Add missing scope for regex escape test	2018-06-12 17:48:38 -05:00
web	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00
account_domain_block_spec.rb
account_filter_spec.rb
account_moderation_note_spec.rb
account_spec.rb	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
backup_spec.rb
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb
custom_emoji_spec.rb	Change custom emoji search to ILIKE instead of = (#7099)	2018-04-10 15:46:27 +02:00
custom_filter_spec.rb	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +02:00
domain_block_spec.rb
email_domain_block_spec.rb
export_spec.rb
favourite_spec.rb
follow_request_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-04 14:16:30 -05:00
follow_spec.rb
home_feed_spec.rb
identity_spec.rb
import_spec.rb
invite_spec.rb
list_account_spec.rb
list_spec.rb
media_attachment_spec.rb
mention_spec.rb
mute_spec.rb
notification_spec.rb
preview_card_spec.rb
remote_follow_spec.rb
remote_profile_spec.rb
report_filter_spec.rb
report_spec.rb	Add missing tests for report.rb (#7324)	2018-05-03 10:42:36 +02:00
session_activation_spec.rb
setting_spec.rb
site_upload_spec.rb
status_pin_spec.rb	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
status_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
stream_entry_spec.rb
subscription_spec.rb
tag_spec.rb
user_spec.rb	Change language opt-out to language opt-in (#7823)	2018-06-17 13:54:02 +02:00