Merge request diffs in web ide
When I am reviewing a merge request in the multi-file editor, I need to know which files and lines have changed relative to the target branch to be able to review them. In addition to the changed line highlighting (difference between buffer and last commit) we should highlight the changed files and lines relative to the target branch.
Proposal
- Add status icon to file list and file tabs indicating which files have been changed in the MR including the local changes in the buffer
- Add line highlighting so that lines changed in the MR can be located in the buffer
Design
This design builds on the design of https://gitlab.com/gitlab-org/gitlab-ee/issues/4570
-
Editing - View and edit files
- Button is default colored
-
Reviewing - Compare changes with the last commit
- Button is blue colored
-
Reviewing (merge request) - Compare changes with the merge request target branch
- Button is blue colored
Edited by James Ramsay (ex-GitLab)