glitchier-soc/config
Claire 11368da545 Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
..
environments Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
initializers Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream 2023-05-25 20:43:25 +02:00
locales Change "Sign in" to "Login" (#24942) 2023-05-10 20:17:55 +02:00
locales-glitch Change captcha to be presented even for invited users (#2227) 2023-05-25 20:13:18 +02:00
routes Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
webpack Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream 2023-05-25 20:43:25 +02:00
application.rb Remove tai locale (#23880) 2023-04-23 22:49:07 +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 Fix pgBouncer resetting application name on every transaction (#23958) 2023-03-05 01:52:42 +01:00
deploy.rb Fix Performance/CollectionLiteralInLoop cop (#24819) 2023-05-04 05:33:55 +02:00
environment.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
i18n-tasks.yml Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
navigation.rb Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +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 Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064) 2023-03-14 14:47:57 +01:00
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +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 2023-03-31 21:30:27 +02:00
sidekiq.yml Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212) 2023-02-13 13:31:42 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00