djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 09:34:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
95e2cab22e
tootlab-mastodon/config
History
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2023-01-10 14:43:38 +01:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00
locales New Crowdin updates (#23393) 2023-02-07 02:41:31 +09:00
locales-glitch New Crowdin updates (#2069) 2023-01-18 15:50:50 +01:00
webpack Change locales file generation to use JSON sources (#2028) 2022-12-21 22:13:14 +01:00
application.rb Address check-i18n warnings (#23313) 2023-02-02 10:14:19 +09: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 Change postgres connection timeout (#21790) 2022-12-07 00:39:36 +01:00
deploy.rb Change master branch to main branch (#20290) 2022-11-10 04:02:05 +01:00
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb feat(puma): enable setting min puma threads in addition to max (#21048) 2023-01-06 07:55:58 +01: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 2023-01-18 17:38:11 +01:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
sidekiq.yml Add environment variable to configure sidekiq concurrency (#19589) 2022-12-15 16:38:37 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml