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

2022-03-14 16:44:35 +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-03-12 11:51:25 +01:00

locales

Fix not being able to upload GIF emojis in admin UI (#17759)

2022-03-14 05:45:22 +01:00

locales-glitch

Add option (on by default) to allow toots with content warnings to trend

2022-02-26 10:46:26 +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

…

brakeman.ignore

Add trending statuses (#17431)

2022-02-25 00:34:14 +01:00

database.yml

Escape database passwords in config/database.yml (#17627)

2022-02-25 01:16:52 +01:00

deploy.rb

…

environment.rb

…

i18n-tasks.yml

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

2022-02-23 18:13:12 +01:00

navigation.rb

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

2022-02-26 09:29:23 +01:00

pghero.yml

…

puma.rb

…

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 e-mail domain blocks to block IPs dynamically (#17635)

2022-02-24 17:28:23 +01:00

storage.yml

…

webpacker.yml

…