Fix 9.2 conflicts for "Fix note header author and time ago wrapping in parallel diff" (!12004) · Merge requests · GitLab.org / GitLab FOSS · GitLab

The 17.0 major release is coming on May 16, 2024! This version brings many exciting improvements to GitLab, but also removes some deprecated features. We are introducing three breaking change windows during which we expect breaking changes to be deployed to GitLab.com. You can read more about it on our blogpost . The third breaking change window begins 2024-05-06 09:00 UTC and ends 2024-05-08 22:00 UTC.

Timothy Andrew requested to merge fix-9-2-stable-conflicts-for-mr-11702 into 9-2-stable Jun 08, 2017

Encountered conflicts while picking !11702 (merged) onto 9-2-stable
Please fix the conflicts and merge this into 9-2-stable

/cc @annabeldunstone