Resolves 26 conflicts via manual review. Key decisions: - signature: kept fork's send-time architecture (PR #79), discarded upstream's editor-manipulation functions - WhatsApp incoming: combined fork's two-layer locking (source_id + contact phone) with upstream's blocked-contact drop. Fixed pre-existing regression where echoes were silently dropped - InstallationConfig: upstream's simplified coder (validated against legacy YAML-in-jsonb data) - schema.rb: regenerated, stripped kanban tables from other branches, restored f_unaccent SQL function |
||
|---|---|---|
| .. | ||
| captain | ||
| email_templates | ||
| integrations | ||
| redis | ||
| webhooks | ||
| base_markdown_renderer_spec.rb | ||
| chatwoot_captcha_spec.rb | ||
| chatwoot_exception_tracker_spec.rb | ||
| chatwoot_hub_spec.rb | ||
| chatwoot_markdown_renderer_spec.rb | ||
| config_loader_spec.rb | ||
| custom_markdown_renderer_spec.rb | ||
| dyte_spec.rb | ||
| global_config_service_spec.rb | ||
| global_config_spec.rb | ||
| linear_spec.rb | ||
| online_status_tracker_spec.rb | ||
| safe_fetch_spec.rb | ||
| vapid_service_spec.rb | ||