mastodon/config
Claire b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' 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 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
initializers Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' 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 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
webpack Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' 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
brakeman.ignore
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
i18n-tasks.yml Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
navigation.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
pghero.yml
puma.rb Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064) 2023-03-14 14:47:57 +01:00
roles.yml
routes.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
secrets.yml
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
webpacker.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00