Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml		2018-05-11 18:12:42 +02:00
..
admin	…
concerns	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
form	…
glitch	Also treat non-whole-word mutes as case-insensitive. #450.	2018-04-30 20:08:22 -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 remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
backup_spec.rb	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
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
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	CAS + SAML authentication feature (#6425)	2018-02-04 05:42:13 +01:00
import_spec.rb	…
invite_spec.rb	…
list_account_spec.rb	…
list_spec.rb	…
media_attachment_spec.rb	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	Change columns in notifications nonnullable (#6764)	2018-03-24 12:51:28 +01:00
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	Isolate each specs for cache store (#6450)	2018-02-17 22:35:05 +01:00
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	Direct messages column (#4514)	2018-04-18 13:09:06 +02:00
stream_entry_spec.rb	…
subscription_spec.rb	…
tag_spec.rb	…
user_spec.rb	Store home feeds for 7 days instead of 14 (#7354)	2018-05-05 00:54:24 +02:00