Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ...

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

2023-07-12 16:03:05 +02:00

..

accounts

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

admin

Fix POST /api/v1/admin/domain_allows returning 200 when no domain is specified (#24958)

2023-05-22 13:44:49 +02:00

announcements

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

apps

Remove useless respond_to calls (#13208)

2020-03-06 01:29:38 +01:00

crypto

Optimize map { ... }.compact calls (#15513)

2021-01-10 00:32:01 +01:00

emails

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

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

featured_tags

Add ability to follow hashtags (#18809)

2022-07-17 13:49:29 +02:00

instances

Fix /api/v1/instance/domain_blocks being unconditionally cached (#24662)

2023-04-26 11:42:47 +02:00

lists

Autofix Rubocop Style/IfUnlessModifier (#23697)

2023-02-18 12:37:47 +01:00

polls

Add more tests for ActivityPub controllers (#13585)

2020-05-03 16:30:36 +02:00

push

Fix Rails/ActionOrder cop (#24692)

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

statuses

Change /api/v1/statuses/:id/history to always return at least one item (#25510)

2023-06-22 14:56:14 +02:00

timelines

Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream

2023-07-12 15:27:32 +02:00

trends

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

accounts_controller.rb

Add time zone preference (#25342)

2023-06-10 03:29:37 +02:00

announcements_controller.rb

Autofix Rubocop Style/RedundantBegin (#23703)

2023-02-19 07:09:40 +09:00

apps_controller.rb

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

blocks_controller.rb

Autofix Rubocop Style/IfUnlessModifier (#23697)

2023-02-18 12:37:47 +01:00

bookmarks_controller.rb

Fix Naming/MemoizedInstanceVariableName cop (#25928)

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

conversations_controller.rb

Add POST /api/v1/conversations/:id/unread (#25509)

2023-06-22 18:46:43 +02:00

custom_emojis_controller.rb

Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed (#24665)

2023-04-28 10:01:38 +02:00

directories_controller.rb

Fix rails rewhere deprecation warning in directories api controller (#25625)

2023-07-01 21:48:16 +02:00

domain_blocks_controller.rb

Autofix Rubocop Style/IfUnlessModifier (#23697)

2023-02-18 12:37:47 +01:00

endorsements_controller.rb

Autofix Rubocop Style/IfUnlessModifier (#23697)

2023-02-18 12:37:47 +01:00

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

Autofix Rubocop Style/IfUnlessModifier (#23697)

2023-02-18 12:37:47 +01:00

followed_tags_controller.rb

Fix pagination of followed tags (#20861)

2022-11-17 10:54:10 +01:00

instances_controller.rb

Fix some user-independent endpoints potentially reading session cookies (#24650)

2023-04-25 22:14:44 +02:00

lists_controller.rb

Add exclusive lists (#22048)

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

markers_controller.rb

Use Rails' index_by where it makes sense (#15542)

2021-01-12 09:27:38 +01: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

Autofix Rubocop Style/IfUnlessModifier (#23697)

2023-02-18 12:37:47 +01:00

notifications_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

polls_controller.rb

Change unauthenticated responses to be cached in REST API (#24348)

2023-04-25 15:41:34 +02:00

preferences_controller.rb

Remove useless respond_to calls (#13208)

2020-03-06 01:29:38 +01:00

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

Autofix Rubocop Style/IfUnlessModifier (#23697)

2023-02-18 12:37:47 +01:00

statuses_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

streaming_controller.rb

Add allow_other_host in redirects which may go outside app (#24252)

2023-03-26 00:38:32 +01:00

suggestions_controller.rb

Change auto-following admin-selected accounts, show in recommendations (#16078)

2021-04-24 17:01:43 +02:00

tags_controller.rb

Change unauthenticated responses to be cached in REST API (#24348)

2023-04-25 15:41:34 +02:00