Feature flag: defer_notify_conflict_to_after_commit

Summary

Feature flag rollout issue for defer_notify_conflict_to_after_commit.

This flag controls whether notify_conflict? and its downstream actions (NotificationService, TodoService) are deferred to run_after_commit during the mark_as_unmergeable state transition, avoiding Gitaly RPCs inside a DB transaction.

Related MR

!225850 (merged)

Rollout plan

  • Enable on staging
  • Enable on GitLab.com for a subset of projects
  • Enable on GitLab.com globally
  • Enable by default
  • Remove feature flag
Edited Mar 04, 2026 by 🤖 GitLab Bot 🤖
Assignee Loading
Time tracking Loading