mastodon/config
tykayn aa4b715513 Merge remote-tracking branch 'glitch-soc/main'
# Conflicts:
#	app/controllers/concerns/sign_in_token_authentication_concern.rb
#	app/javascript/mastodon/features/compose/components/action_bar.js
#	app/javascript/mastodon/features/compose/index.js
2022-05-10 10:17:24 +02:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2022-04-25 17:09:32 +02:00
initializers Merge remote-tracking branch 'glitch-soc/main' 2022-05-10 10:17:24 +02:00
locales Merge remote-tracking branch 'glitch-soc/main' 2022-05-10 10:17:24 +02:00
locales-glitch Update Korean translation (#1765) 2022-05-07 16:56:08 +02:00
webpack Merge remote-tracking branch 'glitch-soc/main' 2022-04-06 11:59:29 +02:00
application.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +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.16.0 to 3.17.0 (#17774) 2022-03-29 18:49:00 +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-02-26 09:29:23 +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 Add PERSISTENT_TIMEOUT option (#11756) 2019-09-04 20:44:08 +02:00
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +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 IP matching from e-mail domain blocks (#18190) 2022-04-29 23:27:03 +02:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml add config to webpacker 2019-12-13 17:13:29 +01:00