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

2022-05-26 22:49:47 +02:00

..

environments

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

2022-04-25 17:09:32 +02:00

initializers

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

2022-05-26 22:49:47 +02:00

locales

Change "dangerous" to "sensitive" in privacy policy and web UI (#18515)

2022-05-26 17:55:05 +02:00

locales-glitch

Add confirmation page when importing blocked domains (#1773)

2022-05-16 18:26:49 +02:00

webpack

…

application.rb

Change search indexing to use batches to minimize resource usage (#18451)

2022-05-18 23:29:14 +02:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

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

2022-04-08 19:53:32 +02:00

navigation.rb

…

pghero.yml

…

puma.rb

…

routes.rb

Add confirmation page when importing blocked domains (#1773)

2022-05-16 18:26:49 +02:00

secrets.yml

…

settings.yml

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

2022-04-08 19:53:32 +02:00

sidekiq.yml

Change search indexing to use batches to minimize resource usage (#18451)

2022-05-18 23:29:14 +02:00

storage.yml

…

webpacker.yml

…