Claire c2817c7fad Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/feed_manager.rb`: Upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process. Conflict is due to glitch-soc having an extra timeline type (direct). Ported upstream's changes. - `app/workers/feed_insert_worker.rb`: Ditto.		2024-12-02 21:08:15 +01:00
..
environments	Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream	2024-12-01 17:36:49 +01:00
imagemagick	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
initializers	Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream	2024-11-24 18:56:15 +01:00
locales	New Crowdin Translations (automated) (#33114)	2024-12-02 08:27:19 +00:00
locales-glitch	New Crowdin Translations (automated) (#2896)	2024-11-24 18:39:20 +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	Update dependency doorkeeper to v5.8.0 (#33000)	2024-11-21 13:48:30 +00:00
boot.rb	…
brakeman.yml	…
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	…
formatjs-formatter.js	…
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	…
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	…
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