• Sean McGivern's avatar
    Fix 500 error when editing conflicts with approvals enabled · 77b59525
    Sean McGivern authored
    When an MR or issue and there's a conflict, we rescue the StaleObjectError and
    render the edit page again. However, for MRs in EE, we need to ensure that
    @suggested_approvers is set before that happens, otherwise the view will fail to
    render.
    77b59525
merge_requests_controller.rb 22.6 KB