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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

2021-10-25 20:28:51 +02:00

..

account_counters_spec.rb

Improve account counters handling (#15913)

2021-03-19 13:14:57 +01:00

account_finder_concern_spec.rb

Handle nil and blank cases in Account finders (#3500)

2017-06-01 08:20:36 -04:00

account_interactions_spec.rb

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

2021-10-25 20:28:51 +02:00

remotable_spec.rb

Fix remote files not using Content-Type header, streaming (#14184)

2020-06-30 23:58:02 +02:00

status_threading_concern_spec.rb

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

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