Álvaro Tejero-Cantero d613972474

🐛 Merge file-level plugin data and base font size on branches (#12569) ...

A branch whose only change was file-level plugin data or the base font
size merged with a success response, and the change was lost. The merge
engine compared colours, typographies, components, media, pages, and
tokens only, so such a branch produced an empty summary and the merge
took the empty-changes shortcut.

The engine now classifies two more kinds three-way: file plugin data,
flattened to namespace and key as page plugin data already is, and the
file options, where an unset base font size reads as the default. Both
kinds count towards ahead, behind, and conflicts, appear in the compare
dialog, and translate into set-plugin-data and set-base-font-size
changes for merge and update from main. Both sides changing the same
key to different values is a modify-modify conflict.

AI-assisted-by: claude-opus-5-5

Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro>

2026-10-22 20:04:02 +02:00

..

rpc/commands

✨ Send more enriched events to nitrate log (#12210)

2026-10-09 10:58:05 +02:00

tasks

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

test_files

Merge remote-tracking branch 'origin/main' into staging

2026-09-29 23:07:26 +02:00

auth_ldap_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-09-10 20:29:44 +02:00

auth_login_lockout_test.clj

✨ Add account lockout after failed login attempts (#11402)

2026-09-23 12:31:50 +02:00

auth_oidc_test.clj

✨ Route the app by query string with screen key

2026-09-15 17:10:54 +02:00

binfile_jobs_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

binfile_svg_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-10-09 09:01:12 +02:00

binfile_test.clj

Merge branch 'develop' into iop-vc-preview

2026-10-14 16:34:48 +02:00

bounce_handling_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

branch_file_queries_test.clj

🐛 Fix the defects the engine design read found

2026-10-06 10:36:55 +02:00

branch_merge_test.clj

🐛 Compare a nil-valued attribute and an absent one as equal

2026-10-06 10:36:55 +02:00

branch_payload_writers_test.clj

♻️ Port branching to the unified jobs substrate

2026-10-06 11:02:31 +02:00

climit_test.clj

🐛 Fix the broken restore test and the flaky climit test

2026-10-13 18:44:40 +00:00

config_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

db_test.clj

✨ Add Prometheus metrics for storage operations (#11700)

2026-09-23 15:25:21 +02:00

db_transaction_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

demo_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

email_blacklist_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

email_sending_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

file_gc_scheduler_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

graph_binder_gate_test.clj

📎 Update copyright headers

2026-09-09 17:58:09 +02:00

graph_sync_parity_test.clj

⬆️ Update deps (#11960)

2026-09-29 09:07:34 +02:00

health_test.clj

🎉 Add graceful instance drain via /readyz

2026-10-13 14:33:32 +02:00

helpers_test.clj

🐛 Fix RPC test helper dropping injected request metadata

2026-09-24 11:42:14 +02:00

helpers.clj

Merge branch 'develop' into iop-vc-preview

2026-10-14 16:34:48 +02:00

http_assets_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

http_client_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-09-10 20:29:44 +02:00

http_errors_test.clj

🐛 Restore rate-limit headers and add Retry-After on 429 (#11895)

2026-09-24 12:19:29 +02:00

http_link_preview_test.clj

📎 Fix copyright owner on several files

2026-09-15 19:22:56 +02:00

http_management_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-09-14 14:50:32 +02:00

http_metrics_test.clj

✨ Make the CLIMIT queue visible with an accumulated gauge

2026-10-13 14:33:32 +02:00

http_middleware_security.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

http_middleware_test.clj

🐛 Fix the defects the review of the branch commands found

2026-10-06 10:36:55 +02:00

http_websocket_test.clj

♻️ Scope organization notifications to specific WebSocket topics (#11460)

2026-10-01 13:16:12 +02:00

jobs_gc_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

jobs_metrics_test.clj

✨ Add skip-if-active option to jobs submit (#12266)

2026-10-11 18:48:02 +02:00

jobs_request_test.clj

✨ Add skip-if-active option to jobs submit (#12266)

2026-10-11 18:48:02 +02:00

jobs_storage_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

jobs_test.clj

✨ Add skip-if-active option to jobs submit (#12266)

2026-10-11 18:48:02 +02:00

loggers_audit_archive_task_test.clj

✨ Send more enriched events to nitrate log (#12210)

2026-10-09 10:58:05 +02:00

loggers_error_reporters_test.clj

✨ Audit-log docs, error-reporting flag and frontend initiator (#11997)

2026-10-02 11:08:13 +02:00

loggers_webhooks_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

logical_deletion_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

media_remote_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-09-10 20:29:44 +02:00

media_sanitize_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

media_test.clj

Merge remote-tracking branch 'origin/main' into staging

2026-10-06 15:56:55 +02:00

metrics_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-10-13 21:04:58 +02:00

migrations_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

nitrate_ingest_audit_log_test.clj

✨ Dual-send audit log archive to Nitrate and Nexus (#12037)

2026-10-01 17:17:11 +02:00

nitrate_test.clj

🐛 Preserve admin console URL path segments (#12196)

2026-10-08 11:38:13 +02:00

objects_gc_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-10-13 21:04:58 +02:00

passwords_test.clj

📎 Update copyright headers

2026-09-09 17:58:09 +02:00

restore_storage_objects_test.clj

🐛 Fix the broken restore test and the flaky climit test

2026-10-13 18:44:40 +00:00

rpc_access_tokens_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

rpc_audit_test.clj

Merge remote-tracking branch 'origin/main' into staging

2026-10-13 14:56:45 +02:00

rpc_auth_override_test.clj

✨ Enable closed schemas for RPC methods (#11136)

2026-09-22 14:03:02 +02:00

rpc_auth_test.clj

✨ Add account lockout after failed login attempts (#11402)

2026-09-23 12:31:50 +02:00

rpc_binfile_test.clj

✨ Enable closed schemas for RPC methods (#11136)

2026-09-22 14:03:02 +02:00

rpc_climit_test.clj

🐛 Keep concurrency limits from deadlocking on nested calls

2026-10-13 14:33:32 +02:00

rpc_commands_error_reports_test.clj

Merge remote-tracking branch 'origin/main' into staging

2026-09-29 23:07:26 +02:00

rpc_comment_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-09-01 12:45:17 +02:00

rpc_cond_middleware_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

rpc_demo_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

rpc_doc_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

rpc_feedback_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

rpc_file_branch_oplog_test.clj

🐛 Make the backend branch tests pass on iop-vc-preview (#12568)

2026-10-22 19:19:38 +02:00

rpc_file_branch_test.clj

🐛 Merge file-level plugin data and base font size on branches (#12569)

2026-10-22 20:04:02 +02:00

rpc_file_pull_request_test.clj

♻️ Port branching to the unified jobs substrate

2026-10-06 11:02:31 +02:00

rpc_file_snapshot_test.clj

🐛 Fix the defects the engine design read found

2026-10-06 10:36:55 +02:00

rpc_file_test.clj

✨ Add get-file-tokens RPC to read a file's design tokens (#12172)

2026-10-09 20:08:14 +02:00

rpc_file_thumbnails_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

rpc_font_test.clj

✨ Add indirection for upload-chunks storage via new table (#11651)

2026-09-15 17:26:43 +02:00

rpc_management_jobs_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

rpc_management_nitrate_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

rpc_management_test.clj

✨ Normalize storage metadata with a closed schema (#11987)

2026-10-01 07:19:21 +02:00

rpc_media_test.clj

💥 Remove client-provided id from creation RPC commands (#11784)

2026-09-22 15:51:50 +02:00

rpc_nitrate_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

rpc_organization_owner_permissions_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

rpc_plugins_test.clj

✨ Ask users to allow global plugins on install

2026-10-07 14:58:32 +02:00

rpc_profile_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

rpc_project_test.clj

💥 Remove client-provided id from creation RPC commands (#11784)

2026-09-22 15:51:50 +02:00

rpc_quotes_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

rpc_rlimit_test.clj

🐛 Restore rate-limit headers and add Retry-After on 429 (#11895)

2026-09-24 12:19:29 +02:00

rpc_team_test.clj

✨ Send more enriched events to nitrate log (#12210)

2026-10-09 10:58:05 +02:00

rpc_test.clj

✨ Enable closed schemas for RPC methods (#11136)

2026-09-22 14:03:02 +02:00

rpc_viewer_test.clj

🐛 Trim linked-library data in view-only bundle for share links (#11627)

2026-09-22 14:43:04 +02:00

rpc_webhooks_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

shell_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

srepl_main_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-10-13 21:04:58 +02:00

storage_gc_deleted_test.clj

🐛 Keep the storage GC running past a blocked chunk

2026-10-13 14:33:32 +02:00

storage_metadata_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

storage_metrics_test.clj

✨ Add Prometheus metrics for storage operations (#11700)

2026-09-23 15:25:21 +02:00

storage_s3_metrics_test.clj

✨ Add Prometheus metrics for storage operations (#11700)

2026-09-23 15:25:21 +02:00

storage_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-10-13 21:04:58 +02:00

storage_tmp_test.clj

🐛 Reserve S3 download path without creating the file

2026-10-05 17:16:47 +02:00

tasks_telemetry_test.clj

✨ Audit-log docs, error-reporting flag and frontend initiator (#11997)

2026-10-02 11:08:13 +02:00

util_blob_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

util_events_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

util_objects_map_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

util_pointer_map_test.clj

📎 Update copyright name on file header (#11346)

2026-08-25 11:55:10 +02:00

util_ssrf_test.clj

Merge remote-tracking branch 'origin/staging' into develop

2026-09-01 12:45:17 +02:00

worker_cron_test.clj

✨ Add unified jobs substrate replacing legacy one-shot task system (#11542)

2026-10-06 07:33:12 +02:00

worker_dispatcher_test.clj

✨ Add skip-if-active option to jobs submit (#12266)

2026-10-11 18:48:02 +02:00

worker_runner_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00

worker_test.clj

✨ Run binfile import and export as durable jobs (#12056)

2026-10-07 11:52:48 +02:00