Claire fcb7917344 Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4 ...

Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.

2025-08-04 21:48:37 +02:00

..

environments

Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream

2025-06-30 17:52:22 +02:00

imagemagick

Drop favicon.ico generation (#30375)

2024-06-26 13:44:08 +00:00

initializers

Merge commit '609a40181e0f3f505707d196985dfb78ab3b3f88' into glitch-soc/merge-4.4

2025-07-09 17:31:28 +02:00

locales

Change quote verification to not bypass authorization flow for mentions (#35528)

2025-08-01 11:34:27 +02:00

locales-glitch

New Crowdin Translations (automated) (#3041)

2025-06-16 20:07:18 +02:00

routes

Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream

2025-06-25 19:29:09 +02:00

templates

Add min. age to terms of service (#34105)

2025-03-07 11:50:52 +00:00

vite

Fix dev mode for glitch-soc

2025-06-16 21:43:30 +02:00

application.rb

Move email env var reading to yml files (#35191)

2025-06-26 12:18:30 +00:00

boot.rb

Use abort instead of warn(); exit in boot.rb env check (#29209)

2024-02-16 14:29:24 +00:00

brakeman.yml

Configure brakeman to ignore url safe preview card urls (#25883)

2023-10-20 15:32:16 +02:00

cache_buster.yml

Fix support for special characters in various environment variables (#35314)

2025-07-09 17:16:57 +02:00

captcha.yml

Move hcaptcha service config to config_for yml (#30662)

2024-10-23 14:25:43 +00:00

database.yml

Update sidekiq to version 7 (#34745)

2025-05-26 15:32:41 +00:00

email.yml

Fix support for special characters in various environment variables (#35314)

2025-07-09 17:16:57 +02:00

environment.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

formatjs-formatter.js

Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream

2023-06-10 12:38:33 +02:00

i18n-tasks.yml

Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream

2025-06-26 18:04:37 +02:00

mastodon.yml

Merge commit '609a40181e0f3f505707d196985dfb78ab3b3f88' into glitch-soc/merge-4.4

2025-07-09 17:31:28 +02:00

navigation.rb

Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream

2025-03-29 17:02:39 +01:00

omniauth.yml

Use config_for for omniauth enabled values (#35015)

2025-06-24 09:32:13 +00:00

pghero.yml

…

puma.rb

Start local prometheus_exporter server only in puma/sidekiq startup (#35005)

2025-06-11 13:37:59 +00:00

roles.yml

Add customizable user roles (#18641)

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

routes.rb

Adds featured tab to web (#34405)

2025-04-10 15:40:30 +00:00

settings.yml

Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

2024-12-25 18:01:37 +01:00

sidekiq.yml

Fix incorrect name in scheduler configuration (#35263)

2025-07-04 15:10:17 +02:00

translation.yml

Fix support for special characters in various environment variables (#35314)

2025-07-09 17:16:57 +02:00

vapid.yml

Fix support for special characters in various environment variables (#35314)

2025-07-09 17:16:57 +02:00

vite.json

Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream

2025-05-25 14:36:51 +02:00