Skip to content

Revert 42465 and 42343: Taller collapsed diff files

Thomas Randolph requested to merge revert/42465-and-42343 into master

What does this MR do?

This MR reverts the MRs !42465 (merged) & !42343 (merged).

After we merged these changes, we got some significant internal feedback that the change was breaking some users' workflows.

Primarily: by expanding the diff files to be much taller (in some cases where there were very few lines of code, taller than the expanded file), a workflow that relies on collapsing files to minimize UI distraction during review is now effectively impossible.

Because we also shipped !40752 (merged) around the same time, the risk that other users might miss collapsed files is much lower. The warning may be enough to prime users to be on the lookout for collapsed files they might miss or to simply expand them all right away. That warning banner mitigates the larger concern we have about users accidentally merging files they never reviewed in the UI, which was the original impetus for making this change to expand the collapsed files.

We're moving forward with a more surgical approach - which began before these MRs ever shipped - in !43296 (merged).

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Thomas Randolph

Merge request reports