Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring

2022-12-15 20:25:25 +01:00

..

accounts

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

2022-03-08 20:22:54 +01:00

admin

Fix changing domain block severity not undoing individual account effects (#22135)

2022-12-15 17:45:02 +01:00

announcements

Add announcements (#12662)

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

apps

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

emails

Fix POST /api/v1/emails/confirmations not being available after sign-up (#17743)

2022-03-12 04:14:25 +01:00

instances

Add specs for Api::V1::Instances::PeersController (#9546)

2018-12-17 11:35:55 +01:00

lists

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

polls

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

push

Add policy param to POST /api/v1/push/subscriptions (#16040)

2021-04-15 05:00:25 +02:00

statuses

Spelling (#17705)

2022-03-06 22:51:40 +01:00

timelines

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

2022-01-28 08:58:32 +01:00

trends

Add trending statuses (#17431)

2022-02-25 00:34:14 +01:00

accounts_controller_spec.rb

Add ability to filter followed accounts' posts by language (#19095)

2022-09-20 23:51:21 +02:00

announcements_controller_spec.rb

Add announcements (#12662)

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

apps_controller_spec.rb

Fix app name, website and redirect URIs not having a maximum length (#16042)

2021-04-15 16:28:43 +02:00

blocks_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

bookmarks_controller_spec.rb

Support min_id-based pagination for bookmarks (#12381)

2019-11-17 17:09:41 +01:00

conversations_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

custom_emojis_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

domain_blocks_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

endorsements_controller_spec.rb

Add spec for Api::V1::EndorsementsController (#9543)

2018-12-17 11:32:44 +01:00

favourites_controller_spec.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

filters_controller_spec.rb

Fix irreversible and whole_word parameters handling in /api/v1/filters (#21988)

2022-12-07 00:10:53 +01:00

follow_requests_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

followed_tags_controller_spec.rb

Add ability to follow hashtags (#18809)

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

instances_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

lists_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

markers_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

media_controller_spec.rb

Add editing for published statuses (#17320)

2022-02-10 00:15:30 +01:00

mutes_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

notifications_controller_spec.rb

Add types param to GET /api/v1/notifications in REST API (#17767)

2022-03-15 04:11:29 +01:00

polls_controller_spec.rb

Refactor and improve tests (#17386)

2022-01-28 00:46:42 +01:00

reports_controller_spec.rb

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

statuses_controller_spec.rb

Add ability to filter individual posts (#18945)

2022-08-25 04:27:47 +02:00

streaming_controller_spec.rb

Lint pass (#8876)

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

suggestions_controller_spec.rb

Re-add follow recommendations API (#7918)

2018-07-03 01:47:56 +02:00

tags_controller_spec.rb

Fix not being able to follow more than one hashtag (#21285)

2022-11-21 10:35:09 +01:00