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 |
||
|---|---|---|
| .. | ||
| agents | ||
| environments | ||
| initializers | ||
| integration | ||
| languages | ||
| locales | ||
| app.yml | ||
| application.rb | ||
| boot.rb | ||
| cable.yml | ||
| database.yml | ||
| elastic_apm.yml | ||
| environment.rb | ||
| features.yml | ||
| installation_config.yml | ||
| llm_models.json | ||
| llm.yml | ||
| markdown_embeds.yml | ||
| newrelic.yml | ||
| puma.rb | ||
| rds-ca-2019-root.pem | ||
| routes.rb | ||
| schedule.yml | ||
| scout_apm.yml | ||
| secrets.yml | ||
| sidekiq.yml | ||
| spring.rb | ||
| storage.yml | ||
| vite.json | ||