Resolve "ActionView::Template::Error: undefined method `any?' for nil:NilClass"
What does this MR do?
Ensure that suggested approvers are set when there is an edit conflict on MRs.
Are there points in the code the reviewer needs to double check?
I'm not particularly happy about changing the shared example, but this exists in CE too.
Why was this MR needed?
If someone else updated an MR while you were editing it, and approvals were enabled, you would see a 500 error.
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary - Tests
-
Added for this feature/bug -
All builds are passing
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Branch has no merge conflicts with master
(if it does - rebase it please) -
Squashed related commits together
What are the relevant issue numbers?
Closes #2618 (closed).