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

Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.

2022-08-28 11:31:00 +02:00

..

environments

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

2022-08-25 05:07:39 +02:00

initializers

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

2022-08-25 05:07:39 +02:00

locales

Add admin API for managing canonical e-mail blocks (#19067)

2022-08-28 03:31:54 +02:00

locales-glitch

Make “Flavour and skin” admin setting label translatable (#1791)

2022-05-31 16:52:52 +02:00

webpack

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

2022-08-28 11:31:00 +02:00

application.rb

Remove Rack::Deflater (#17937)

2022-08-13 15:40:00 +02:00

boot.rb

Bump bootsnap from 1.6.0 to 1.8.1 (#16677)

2021-09-19 14:42:32 +09:00

brakeman.ignore

Fix IDN domains not being rendered correctly in a few left-over places (#17848)

2022-03-22 10:07:11 +01:00

database.yml

Format JSON and YAML using Prettier (#17823)

2022-03-21 04:46:11 +01:00

deploy.rb

Bump capistrano from 3.17.0 to 3.17.1 (#18949)

2022-08-15 07:50:50 +09:00

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

i18n-tasks.yml

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

2022-04-08 19:53:32 +02:00

navigation.rb

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

2022-07-05 09:33:44 +02:00

pghero.yml

Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)

2020-05-04 13:52:41 +02:00

puma.rb

Add PERSISTENT_TIMEOUT option (#11756)

2019-09-04 20:44:08 +02:00

roles.yml

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

routes.rb

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

2022-08-28 11:31:00 +02:00

secrets.yml

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

settings.yml

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

2022-04-08 19:53:32 +02:00

sidekiq.yml

Remove digest e-mails (#17985)

2022-08-25 23:38:22 +02:00

storage.yml

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

webpacker.yml

Do not try to parse gif files as CSS or JS

2019-03-16 14:23:50 +01:00