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

2022-02-21 15:46:53 +01:00

..

environments

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

2022-01-28 08:58:32 +01:00

initializers

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

2022-02-21 15:46:53 +01:00

locales

New Crowdin updates (#17514)

2022-02-19 13:20:00 +09:00

locales-glitch

Add link to /about/more to the CAPTCHA verification page

2022-01-26 14:09:11 +01:00

webpack

Add support for multiple source files per pack

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

application.rb

Add global locale param (#17464)

2022-02-08 02:34:56 +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

Add appeals (#17364)

2022-02-14 21:27:53 +01:00

database.yml

…

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 'master' into glitch-soc/merge-upstream

2020-07-01 19:23:14 +02:00

navigation.rb

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

2022-02-17 10:58:44 +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

…

routes.rb

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

2022-02-17 10:58:44 +01:00

secrets.yml

…

settings.yml

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

2022-02-17 10:58:44 +01:00

sidekiq.yml

Add trending links (#16917)

2021-11-25 13:07:38 +01:00

storage.yml

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

webpacker.yml

…