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

Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.

2022-11-28 11:33:34 +01:00

..

environments

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

2022-11-17 12:01:37 +01:00

initializers

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

2022-11-28 11:33:34 +01:00

locales

New Crowdin updates (#20942)

2022-11-25 09:40:05 +09:00

locales-glitch

Remove glitch-soc-specific translations of upstreamed feature (domain block import)

2022-11-17 12:08:59 +01:00

webpack

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

2022-08-28 11:31:00 +02:00

application.rb

Remove support for Ruby 2.6 (#21477)

2022-11-27 20:41:39 +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 master branch to main branch (#20290)

2022-11-10 04:02:05 +01:00

environment.rb

…

i18n-tasks.yml

Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""

2022-11-12 10:17:22 +01:00

navigation.rb

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

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

roles.yml

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

routes.rb

Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)

2022-11-17 11:05:09 +01:00

secrets.yml

…

settings.yml

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

2022-10-28 19:23:58 +02:00

sidekiq.yml

Change incoming activity processing to happen in ingress queue (#20264)

2022-11-10 14:21:51 +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