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

Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.

2022-05-11 09:37:48 +02:00

..

controllers

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

2022-05-11 09:37:48 +02:00

fabricators

Fix report category not being saved in REST API (#17682)

2022-03-02 18:57:08 +01:00

features

Add submit button to the top of preferences pages (#13068)

2020-03-08 16:04:03 +01:00

fixtures

Fix some link previews being incorrectly generated from other prior links (#16885)

2021-10-21 20:39:35 +02:00

helpers

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

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

lib

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

2022-05-11 09:37:48 +02:00

mailers

Fix failure when sending warning emails with custom text (#17983)

2022-04-07 14:47:30 +02:00

models

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

2022-04-28 18:16:42 +02:00

policies

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

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

presenters

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

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

requests

Further preparation for Rails 6 (#15916)

2021-03-19 02:45:34 +01:00

routing

Move create/destroy actions for api/v1/statuses to namespace (#3678)

2017-06-10 09:39:26 +02:00

serializers/activitypub

Fix account URI in UpdatePollSerializer (#11194)

2019-06-27 19:41:55 +02:00

services

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

2022-05-03 10:16:49 +02:00

support

Spelling (#17705)

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

validators

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

2022-05-01 16:52:27 +02:00

views

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

2022-03-04 01:07:49 +01:00

workers

Fix single Redis connection being used across all threads (#18135)

2022-04-28 17:47:34 +02:00

rails_helper.rb

Fix single Redis connection being used across all threads (#18135)

2022-04-28 17:47:34 +02:00

spec_helper.rb

Improve tests involving push_bulk (#17508)

2022-02-10 19:42:45 +01:00