mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-23 21:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/config
History
Jeremy Kescher 0d829dadea
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/features/ui/index.js
#	app/javascript/mastodon/features/ui/index.js
2023-01-18 22:29:27 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2023-01-10 14:43:38 +01:00
initializers Merge remote-tracking branch 'upstream/main' into develop 2022-12-16 17:53:33 +01:00
locales Merge remote-tracking branch 'upstream/main' into develop 2023-01-18 22:29:27 +01:00
locales-glitch Merge remote-tracking branch 'upstream/main' into develop 2023-01-18 22:29:27 +01:00
webpack Change locales file generation to use JSON sources (#2028) 2022-12-21 22:13:14 +01:00
application.rb Add Western Frisian support (#18602) 2022-12-15 19:03:44 +01: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 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 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 remote-tracking branch 'upstream/main' into develop 2023-01-18 22:29:27 +01:00
secrets.yml Upgrade to Rails 5.0.0.1 2016-08-17 17:58:00 +02:00
settings.yml Merge remote-tracking branch 'upstream/main' into develop 2023-01-18 22:29:27 +01:00
sidekiq.yml Merge remote-tracking branch 'upstream/main' into develop 2022-12-16 17:53:33 +01: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