Thibaut Girka 6fdc4e8d47 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		2020-10-21 19:10: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	2020-10-21 19:10:50 +02:00
form	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
web	…
account_alias_spec.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
account_conversation_spec.rb	…
account_deletion_request_spec.rb	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_migration_spec.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
account_moderation_note_spec.rb	…
account_spec.rb	Search account domain in lowercase (#13016)	2020-02-01 15:42:24 +01:00
account_stat_spec.rb	Fix account counters being overwritten by parallel writes (#12045)	2019-10-02 04:59:37 +02:00
account_tag_stat_spec.rb	…
announcement_mute_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
announcement_reaction_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
announcement_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
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	Add specs for CustomEmojiFilter (#9599)	2018-12-21 18:52:57 +01:00
custom_emoji_spec.rb	Make custom emoji domains case insensitive #9351 (#9474)	2018-12-11 05:30:57 +01:00
custom_filter_spec.rb	…
device_spec.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
domain_allow_spec.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
domain_block_spec.rb	Allow blocking TLDs, and fix TLD blocks not being editable (#12805)	2020-01-08 22:42:05 +01:00
email_domain_block_spec.rb	…
encrypted_message_spec.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
export_spec.rb	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
favourite_spec.rb	…
featured_tag_spec.rb	Add featured hashtags to profiles (#9755)	2019-02-04 04:25:59 +01:00
follow_request_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
follow_spec.rb	…
home_feed_spec.rb	Fix performance of home feed regeneration (#12084)	2019-10-06 22:11:17 +02:00
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
ip_block_spec.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
list_account_spec.rb	…
list_spec.rb	…
marker_spec.rb	Add timeline read markers API (#11762)	2019-09-06 13:55:51 +02:00
media_attachment_spec.rb	Fix media attachments without file being uploadable (#12562)	2020-01-23 21:40:03 +01:00
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
one_time_key_spec.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
poll_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
poll_vote_spec.rb	Implement pending tests (#11415)	2019-07-27 10:24:26 +02:00
preview_card_spec.rb	…
public_feed_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-08 16:26:47 +02:00
relationship_filter_spec.rb	Fix followings list order | Issue #13538 (#13676)	2020-05-08 20:17:16 +02:00
relay_spec.rb	…
remote_follow_spec.rb	Fix uncaught domain normalization error in remote follow (#11703)	2019-08-30 02:19:17 +02:00
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	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
session_activation_spec.rb	…
setting_spec.rb	…
site_upload_spec.rb	…
status_pin_spec.rb	…
status_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-08 16:26:47 +02:00
status_stat_spec.rb	…
system_key_spec.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
tag_feed_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-08 16:26:47 +02:00
tag_spec.rb	Fix hashtags being split by ZWNJ character (#11821)	2019-09-13 16:01:26 +02:00
trending_tags_spec.rb	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
unavailable_domain_spec.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	2020-04-15 20:33:24 +02:00
user_invite_request_spec.rb	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
user_spec.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
webauthn_credentials_spec.rb	Fix validates :sign_count of WebauthnCredential (#14806)	2020-09-16 20:16:46 +02:00