Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.		2024-11-24 16:46:28 +01:00
..
environments	Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream	2024-11-10 13:18:43 +01:00
imagemagick	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
initializers	Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream	2024-11-24 16:46:28 +01:00
locales	New Crowdin Translations (automated) (#32990)	2024-11-20 08:24:50 +00:00
locales-glitch	New Crowdin Translations (automated) (#2851)	2024-11-10 22:07:04 +01:00
routes	Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream	2024-11-15 18:44:32 +01:00
templates	Unpluralize mistakenly changed privacy template (#30759)	2024-06-18 21:34:17 +00:00
webpack	Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream	2024-07-24 20:07:37 +02:00
application.rb	Use mastodon config namespace to load software update default value via config_for (#30534)	2024-11-12 08:28:31 +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	Move self destruct check to config_for and add constant for verifier string (#32943)	2024-11-18 09:57:16 +00:00
navigation.rb	Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream	2024-11-15 18:44:32 +01:00
pghero.yml
puma.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
roles.yml
routes.rb	Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream	2024-11-03 20:51:58 +01:00
settings.yml	Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream	2024-11-15 18:44:32 +01:00
sidekiq.yml	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
storage.yml
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