This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		2019-08-29 12:07:50 +02:00
..
admin	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
form	Fix remote and staff-removed statuses leaving media behind for a day (#11638)	2019-08-22 04:17:12 +02:00
web	…
account_conversation_spec.rb	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_moderation_note_spec.rb	…
account_spec.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	2019-08-06 15:33:03 +02:00
account_stat_spec.rb	…
account_tag_stat_spec.rb	…
backup_spec.rb	…
block_spec.rb	…
conversation_mute_spec.rb	…
conversation_spec.rb	Revert "Remove conversation URI (#11423)" (#11424)	2019-07-28 17:47:37 +02:00
custom_emoji_category_spec.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
custom_emoji_filter_spec.rb	…
custom_emoji_spec.rb	…
custom_filter_spec.rb	…
domain_allow_spec.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
domain_block_spec.rb	Change domain blocks to automatically support subdomains (#11138)	2019-06-22 00:13:10 +02:00
email_domain_block_spec.rb	…
export_spec.rb	…
favourite_spec.rb	…
featured_tag_spec.rb	…
follow_request_spec.rb	…
follow_spec.rb	…
home_feed_spec.rb	…
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	Fix invites not being disabled upon account suspension (#11412)	2019-07-26 18:55:33 +02:00
list_account_spec.rb	…
list_spec.rb	…
media_attachment_spec.rb	…
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	…
poll_spec.rb	…
poll_vote_spec.rb	Implement pending tests (#11415)	2019-07-27 10:24:26 +02:00
preview_card_spec.rb	…
relay_spec.rb	…
remote_follow_spec.rb	…
report_filter_spec.rb	…
report_spec.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	2019-08-06 15:33:03 +02:00
scheduled_status_spec.rb	…
session_activation_spec.rb	…
setting_spec.rb	…
site_upload_spec.rb	…
status_pin_spec.rb	…
status_spec.rb	Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)	2019-07-05 02:14:56 +02:00
status_stat_spec.rb	…
tag_spec.rb	Add more accurate hashtag search (#11579)	2019-08-18 03:45:51 +02:00
user_invite_request_spec.rb	…
user_spec.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00