Claire ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly.		2025-01-14 20:38:32 +01:00
..
environments	Use a system setting for the Referer policy (#33239)	2024-12-10 13:16:52 +00:00
imagemagick	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
initializers	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
locales	New Crowdin Translations (automated) (#33582)	2025-01-14 08:44:58 +00:00
locales-glitch	New Crowdin Translations (automated) (#2907)	2024-12-23 18:28:38 +01:00
routes	Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream	2024-12-25 18:01:37 +01:00
templates	Fix hard wrap of markdown list in TOS template (#33230)	2024-12-10 01:43:03 +00:00
webpack	Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream	2024-07-24 20:07:37 +02:00
application.rb	Update rails to version 8.0.1 (#32357)	2025-01-03 16:08:21 +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
captcha.yml	Move hcaptcha service config to config_for yml (#30662)	2024-10-23 14:25:43 +00:00
database.yml	DB Replica database_tasks as ENV (#32908)	2024-11-19 08:54:28 +00: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 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream	2024-10-06 16:07:58 +02:00
mastodon.yml	Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream	2025-01-14 20:38:32 +01:00
navigation.rb	Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream	2025-01-06 20:36:25 +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	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Extend custom CSS cache time with digest paths (#33207)	2025-01-08 08:48:45 +00:00
settings.yml	Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream	2024-12-25 18:01:37 +01:00
sidekiq.yml	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
translation.yml	Move translation service config to config_for yml (#30663)	2024-10-23 13:32:18 +00:00
webpacker.yml	Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream	2024-05-04 14:59:00 +02:00