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

2022-02-08 18:23: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-01-23 18:24:01 +01:00

locales

Remove language detection through cld3 (#17478)

2022-02-08 02:41:17 +01:00

locales-glitch

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

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

webpack

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

2021-09-02 10:52:09 +02: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

Fix error-prone SQL queries (#15828)

2022-01-23 18:10:10 +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

…

navigation.rb

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

2021-12-16 16:20:44 +01:00

pghero.yml

…

puma.rb

…

routes.rb

Add ability to set hCaptcha either on registration form or on e-mail validation

2022-01-25 23:09:48 +01:00

secrets.yml

…

settings.yml

Change CAPTCHA handling to be only on email verification

2022-01-25 23:56:57 +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

…