Claire f313bf3e97 Merge branch 'main' into glitch-soc/merge-upstream

2022-03-28 16:22:28 +02:00

..

environments

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-28 16:22:28 +02:00

initializers

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-26 19:18:55 +01:00

locales

Fix extra “zero” key in some plural translation strings (#17883)

2022-03-28 01:16:02 +02:00

locales-glitch

Fix blank screen when trying to copy emoji with a too large file size (#1718)

2022-03-14 17:34:53 +01:00

webpack

Add support for multiple source files per pack

2022-02-12 00:10:28 +01:00

application.rb

Fix wrong language code for Kurdish languages (#17812)

2022-03-17 01:37:03 +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

Format JSON and YAML using Prettier (#17823)

2022-03-21 04:46:11 +01:00

deploy.rb

Change references to tootsuite/mastodon to mastodon/mastodon (#16491)

2021-07-13 15:46:20 +02:00

environment.rb

…

i18n-tasks.yml

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-22 17:00:38 +01: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-03-10 09:52:45 +01:00

secrets.yml

…

settings.yml

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

sidekiq.yml

Change frequency of trends review notifications from 2 hours to 6 hours (#17850)

2022-03-22 11:58:25 +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