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 |
||
|---|---|---|
| .. | ||
| monkey_patches | ||
| 00_init.rb | ||
| 01_inject_enterprise_edition_module.rb | ||
| 01_redis.rb | ||
| actioncable.rb | ||
| active_record_query_trace.rb | ||
| active_storage_opus_fix.rb | ||
| acts_as_taggable_on.rb | ||
| ai_agents.rb | ||
| application_controller_renderer.rb | ||
| assets.rb | ||
| audited.rb | ||
| backtrace_silencers.rb | ||
| baileys.rb | ||
| content_security_policy.rb | ||
| cookies_serializer.rb | ||
| cors.rb | ||
| custom_error_codes.rb | ||
| datadog.rb | ||
| devise_token_auth.rb | ||
| devise.rb | ||
| event_handlers.rb | ||
| facebook_messenger.rb | ||
| feature_policy.rb | ||
| filter_parameter_logging.rb | ||
| geocoder.rb | ||
| git_sha.rb | ||
| inflections.rb | ||
| languages.rb | ||
| liquid_handler.rb | ||
| lograge.rb | ||
| mailer.rb | ||
| mime_types.rb | ||
| omniauth.rb | ||
| permissions_policy.rb | ||
| rack_attack.rb | ||
| rack_profiler.rb | ||
| rack_timeout.rb | ||
| resend.rb | ||
| schema_dumper_functions.rb | ||
| searchkick.rb | ||
| secure_password.rb | ||
| sentry.rb | ||
| session_store.rb | ||
| sidekiq.rb | ||
| stripe.rb | ||
| warden_hooks.rb | ||
| wrap_parameters.rb | ||