glitchier-soc/lib
Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
  Not really a conflict, upstream change (removing the spam checker) too close
  to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
  Same.
- `app/services/remove_status_service.rb`:
  Same.
- `app/views/admin/settings/edit.html.haml`:
  Same.
- `config/settings.yml`:
  Same.
- `config/environments/production.rb`:
  Not a real conflict, upstream added a default HTTP header, but we have
  extra headers in glitch-soc.
  Added the header.
2021-04-20 12:17:14 +02:00
..
action_dispatch replace all instances of "ends_with?" with "end_with?" () 2021-02-19 09:56:14 +01:00
active_record Remove dependency on pluck_each gem () 2021-04-12 03:35:58 +02:00
assets Add emoji autosuggest () 2017-09-23 14:47:32 +02:00
chewy/strategy Fix unnecessary queries when batch-removing statuses, 100x faster () 2020-12-22 17:13:55 +01:00
devise Fix authentication before 2FA challenge () 2019-09-24 04:35:36 +02:00
generators Add post-deployment migration system () 2018-08-13 18:17:20 +02:00
json_ld Fixed code quality issues () 2021-01-31 21:26:09 +01:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-04-05 14:31:07 +02:00
paperclip Fixed code quality issues () 2021-01-31 21:26:09 +01:00
rails Fix obsolete digitalocean.rake file breaking rake tasks () 2021-02-11 02:11:30 +01:00
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning () 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 2021-04-20 12:17:14 +02:00
templates Add post-deployment migration system () 2018-08-13 18:17:20 +02:00
webpacker Add subresource integrity for JS and CSS assets () 2020-11-06 11:56:31 +01:00
cli.rb Deal with collation-related index corruption () 2020-11-19 17:37:49 +01:00
enumerable.rb Optimize map { ... }.compact calls () 2021-01-10 00:32:01 +01:00
exceptions.rb Prepare Mastodon for zeitwerk autoloader () 2021-03-19 02:42:43 +01:00