Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml

2019-07-19 18:26:49 +02:00

..

assets

Improvements to image upload validation and creation (#10431)

2019-04-01 07:30:46 +02:00

access_token_fabricator.rb

…

accessible_access_token_fabricator.rb

…

account_domain_block_fabricator.rb

…

account_fabricator.rb

Record account suspend/silence time and keep track of domain blocks (#10660)

2019-05-14 19:05:02 +02:00

account_identity_proof_fabricator.rb

Add Keybase integration (#10297)

2019-03-18 21:00:55 +01:00

account_moderation_note_fabricator.rb

…

account_pin_fabricator.rb

Public profile endorsements (accounts picked by profile owner) (#8146)

2018-08-09 09:56:53 +02:00

account_stat_fabricator.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

account_tag_stat_fabricator.rb

Add profile directory (#9427)

2018-12-06 17:36:11 +01:00

account_warning_fabricator.rb

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

account_warning_preset_fabricator.rb

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

admin_action_log_fabricator.rb

…

application_fabricator.rb

…

backup_fabricator.rb

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

block_fabricator.rb

…

bookmark_fabricator.rb

Add spec for bookmark endpoints

2018-04-11 21:05:34 +02:00

conversation_account_fabricator.rb

Add conversations API (#8832)

2018-10-07 23:44:58 +02:00

conversation_fabricator.rb

…

conversation_mute_fabricator.rb

…

custom_emoji_category_fabricator.rb

Add categories for custom emojis (#11196)

2019-06-28 15:54:10 +02:00

custom_emoji_fabricator.rb

…

custom_filter_fabricator.rb

Keyword/phrase filtering (#7905)

2018-06-29 15:34:36 +02:00

domain_block_fabricator.rb

…

email_domain_block_fabricator.rb

…

favourite_fabricator.rb

…

featured_tag_fabricator.rb

Add featured hashtags to profiles (#9755)

2019-02-04 04:25:59 +01:00

follow_fabricator.rb

…

follow_request_fabricator.rb

…

identity_fabricator.rb

CAS + SAML authentication feature (#6425)

2018-02-04 05:42:13 +01:00

import_fabricator.rb

…

invite_fabricator.rb

Add consumable invites (#5814)

2017-11-27 16:07:59 +01:00

list_account_fabricator.rb

…

list_fabricator.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

media_attachment_fabricator.rb

…

mention_fabricator.rb

…

mute_fabricator.rb

…

notification_fabricator.rb

Change columns in notifications nonnullable (#6764)

2018-03-24 12:51:28 +01:00

poll_fabricator.rb

Add polls (#10111)

2019-03-03 22:18:23 +01:00

poll_vote_fabricator.rb

Add polls (#10111)

2019-03-03 22:18:23 +01:00

relay_fabricator.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

report_fabricator.rb

…

report_note_fabricator.rb

Add tests for report notes controller (#7589)

2018-05-22 14:45:10 +02:00

scheduled_status_fabricator.rb

Add scheduled statuses (#9706)

2019-01-05 12:43:28 +01:00

session_activation_fabricator.rb

…

setting_fabricator.rb

…

site_upload_fabricator.rb

Improvements to image upload validation and creation (#10431)

2019-04-01 07:30:46 +02:00

status_fabricator.rb

…

status_pin_fabricator.rb

…

status_stat_fabricator.rb

Move status counters to separate table, count replies (#8104)

2018-08-14 19:19:32 +02:00

subscription_fabricator.rb

…

tag_fabricator.rb

…

user_fabricator.rb

Add REST API for creating an account (#9572)

2018-12-24 19:12:38 +01:00

user_invite_request_fabricator.rb

Add "why do you want to join" field to invite requests (#10524)

2019-04-09 23:06:30 +09:00

web_push_subscription_fabricator.rb

Ensure push subscription is immediately removed when application is revoked (#7548)

2018-05-19 21:05:08 +02:00

web_setting_fabricator.rb

Ensure push subscription is immediately removed when application is revoked (#7548)

2018-05-19 21:05:08 +02:00