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

Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.

2022-02-22 18:06:29 +01:00

..

action_dispatch

replace all instances of "ends_with?" with "end_with?" (#15745)

2021-02-19 09:56:14 +01:00

active_record

Remove dependency on pluck_each gem (#16012)

2021-04-12 03:35:58 +02:00

assets

Add emoji autosuggest (#5053)

2017-09-23 14:47:32 +02:00

chewy/strategy

Fix unnecessary queries when batch-removing statuses, 100x faster (#15387)

2020-12-22 17:13:55 +01:00

devise

Fix authentication before 2FA challenge (#11943)

2019-09-24 04:35:36 +02:00

generators

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00

json_ld

Fixed code quality issues (#15541)

2021-01-31 21:26:09 +01:00

mastodon

Forward-port version bump to 3.4.6 (#17434)

2022-02-03 14:21:38 +01:00

paperclip

Fix some media attachments being converted with too high framerates (#17619)

2022-02-22 17:11:22 +01:00

rails

Fix obsolete digitalocean.rake file breaking rake tasks (#15618)

2021-02-11 02:11:30 +01:00

redis

Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)

2020-07-01 19:05:21 +02:00

sanitize_ext

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

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

tasks

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

2022-02-08 18:23:53 +01:00

templates

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00

terrapin

Add Ruby 3.0 support (#16046)

2021-05-06 14:22:54 +02:00

webpacker

Add subresource integrity for JS and CSS assets (#15096)

2020-11-06 11:56:31 +01:00

cli.rb

Add ability for admins to delete canonical email blocks (#16644)

2021-12-17 23:02:14 +01:00

enumerable.rb

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

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

exceptions.rb

Fix media redownload worker retrying on unexpected response codes (#16111)

2021-05-05 23:46:59 +02:00

sidekiq_error_handler.rb

Fix warnings on Rails boot (#16946)

2021-12-27 00:47:20 +01:00