Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ...

Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.

2024-01-10 17:51:12 +01:00

..

accounts

Fix call to inefficient delete_matched cache method in domain blocks (#28374)

2023-12-18 16:14:43 +00:00

admin

Add ability to require approval when users sign up using specific email domains (#28468)

2024-01-04 09:07:05 +00:00

announcements

…

apps

Feature: Allow token introspection without read scope (#27142)

2023-10-18 14:10:07 +02:00

crypto

…

emails

Fix HTTP 500 in /api/v1/emails/check_confirmation (#25595)

2023-07-02 00:05:44 +02:00

featured_tags

…

instances

Convert /instances/* controller specs to request specs (#27988)

2023-11-20 11:05:28 +00:00

lists

…

peers

Improve interaction modal error handling (#26795)

2023-09-05 23:49:48 +02:00

polls

…

profile

Refactor Api::V1::ProfilesController into two separate controllers (#26573)

2023-08-21 15:47:09 +02:00

push

Fix Rails/ActionOrder cop (#24692)

2023-04-30 06:46:39 +02:00

statuses

Remove default_scope from StatusEdit class (#28042)

2023-11-23 09:26:11 +00:00

timelines

Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream

2023-12-19 19:51:40 +01:00

trends

…

accounts_controller.rb

Fix call to inefficient delete_matched cache method in domain blocks (#28374)

2023-12-18 16:14:43 +00:00

announcements_controller.rb

…

apps_controller.rb

…

blocks_controller.rb

…

bookmarks_controller.rb

Fix Naming/MemoizedInstanceVariableName cop (#25928)

2023-07-12 10:08:51 +02:00

conversations_controller.rb

Change link previews to keep original URL from the status (#27312)

2023-11-13 09:58:28 +00:00

custom_emojis_controller.rb

…

directories_controller.rb

Fix Style/RedundantReturn cop (#28391)

2023-12-18 09:50:51 +00:00

domain_blocks_controller.rb

…

endorsements_controller.rb

…

favourites_controller.rb

Fix Naming/MemoizedInstanceVariableName cop (#25928)

2023-07-12 10:08:51 +02:00

featured_tags_controller.rb

Remove dead code in Api::V1::FeaturedTagsController (#25073)

2023-05-23 14:27:37 +02:00

filters_controller.rb

Fix Rails/ActionOrder cop (#24692)

2023-04-30 06:46:39 +02:00

follow_requests_controller.rb

Fix call to inefficient delete_matched cache method in domain blocks (#28374)

2023-12-18 16:14:43 +00:00

followed_tags_controller.rb

…

instances_controller.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

invites_controller.rb

Add support for invite codes in the registration API (#27805)

2023-11-13 13:27:00 +00:00

lists_controller.rb

Add exclusive lists (#22048)

2023-06-05 09:37:02 +02:00

markers_controller.rb

Change markers API to use a replica (#25851)

2023-07-12 18:57:40 +02:00

media_controller.rb

Make it possible to upload audio and video to Heroku app (#24866)

2023-05-05 14:41:07 +02:00

mutes_controller.rb

…

notifications_controller.rb

Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

2023-07-13 13:35:15 +02:00

polls_controller.rb

…

preferences_controller.rb

…

reports_controller.rb

Add forward_to_domains parameter to POST /api/v1/reports (#25866)

2023-07-10 18:26:56 +02:00

scheduled_statuses_controller.rb

…

statuses_controller.rb

…

streaming_controller.rb

Fix streaming API redirection ignoring the port of streaming_api_base_url (#28558)

2024-01-02 12:27:51 +00:00

suggestions_controller.rb

Change algorithm of follow recommendations (#28314)

2023-12-19 10:59:43 +00:00

tags_controller.rb

Remove unfollowed hashtag posts from home feed (#26028)

2023-07-17 13:56:28 +02:00