Skip to content

Cache `#can_be_resolved_in_ui?` git operations

Alejandro Rodríguez requested to merge cache-refactor into master

What does this MR do?

Cache #can_be_resolved_in_ui? git operations

Are there points in the code the reviewer needs to double check?

No

Why was this MR needed?

MergeRequests::Conflicts::ListService fetches the full conflict diffs on each call, which translates into a large volume of git operations. Especially in the post-gitaly world, this is unsustainable.

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes gitaly#1051 (closed)

Merge request reports