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

Conflicts:
- `Gemfile`:
  Upstream removed blank lines.

2022-11-14 20:27:31 +01:00

..

environments

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

2022-11-12 13:28:03 +01:00

initializers

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

2022-11-14 20:27:31 +01:00

locales

New Crowdin updates (#20476)

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

locales-glitch

Add back missing glitch-soc admin settings (#1919)

2022-11-12 13:24:53 +01:00

webpack

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

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

application.rb

Fix mailers queue not being used for mailers (#20274)

2022-11-10 02:31:09 +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

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

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-10-28 19:23:58 +02: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

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

2022-11-14 20:27:31 +01:00

secrets.yml

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

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