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

2022-04-04 17:25:57 +02:00

..

environments

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

2022-03-28 16:22:28 +02:00

initializers

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

2022-04-04 17:25:57 +02:00

locales

Update en.yml (#17942)

2022-04-03 14:02:29 +02:00

locales-glitch

Fix blank screen when trying to copy emoji with a too large file size (#1718)

2022-03-14 17:34:53 +01:00

webpack

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

2022-04-04 17:25:57 +02:00

application.rb

fix: s3_force_single_request not parsed (#17922)

2022-04-01 23:56:23 +02: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

Bump capistrano from 3.16.0 to 3.17.0 (#17774)

2022-03-29 18:49:00 +09:00

environment.rb

…

i18n-tasks.yml

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

2022-03-22 17:00:38 +01:00

navigation.rb

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

2022-02-26 09:29:23 +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

…

routes.rb

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

2022-03-30 13:40:10 +02:00

secrets.yml

…

settings.yml

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

2022-03-08 20:22:54 +01:00

sidekiq.yml

Change frequency of trends review notifications from 2 hours to 6 hours (#17850)

2022-03-22 11:58:25 +01:00

storage.yml

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

webpacker.yml

…