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

Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.

2021-02-12 10:28:32 +01:00

..

action_dispatch

Drop dependency on secure_headers, fix response headers (#15712)

2021-02-11 23:47:05 +01: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

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

2021-02-03 17:02:48 +01:00

paperclip

Fixed code quality issues (#15541)

2021-01-31 21:26:09 +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

tasks

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

2020-12-23 01:47:45 +01:00

templates

Add post-deployment migration system (#8182)

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

webpacker

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

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

cli.rb

Deal with collation-related index corruption (#14860)

2020-11-19 17:37:49 +01:00

enumerable.rb

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

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