3

I'm performing a merge review (code review) in GitLab. I entered some file comments then the author responded to the comments and made some changes to the files. I can view the comment thread, and the relevant portion of the original file on the merge request Overview page. And a link there will take me to a diff between the original and changed files.

But how can I see the comment, response and file diff at the same time? Open the diff link in a new window?

GitLab version = Enterprise Edition 12.10.1-ee

(Newbie stackexchange user - Apologies for any breaches of etiquette.)

user2048
  • 33
  • 4

2 Answers2

0

If you want to see all the merge requests, you can check that in the left panel as 'Merge request' option. If you check the particular merge request, you can see Discussion, Commits , Changes at the bottom. It will be easier here for you to check what changes has been made.

Bogota
  • 401
  • 4
  • 15
  • Does your suggestion still apply after the merge has been performed? Since I posted the question, the merge request has been performed and I don't see what you describe. After clicking on the merge request I see what amounts to tabs for Overview, Commits, and Changes, directly under the merge request name.These tabs will show me the discussions and file diffs, but not at the same time. On the Overview tab I can see all the discussions but no file diffs. And on the Changes tab I can see all the file diffs but none of the discussions. – user2048 May 11 '20 at 13:33
0

Check if GitLab 14.6 (December 2021) improves your use case:

View inline the change that outdated a merge request thread

When addressing review feedback in merge requests, you often change lines your reviewers have commented on.
In those comment threads, GitLab indicates that new changes were made.

However, to understand if those new changes address the feedback, reviewers would have to navigate away from the context of the discussion.

Now, when viewing threads related to old changes, you can view the new changes directly in the thread.
This improved context helps you review faster and more accurately.

https://about.gitlab.com/images/14_6/create-code-review-outdated-change-inline.png -- View inline the change that outdated a merge request thread

See Documentation and Issue.

GitLab 16.2 (July 2023) adds:

Interactive diff suggestions in merge requests

When you suggest changes in a merge request, you can now edit your suggestions more quickly. In a comment, switch to the rich text editor and use the UI to move up and down the lines of text. With this change, you can view your suggestions exactly as they will appear when the comment is posted.

The rich text editor is a new way of editing in GitLab. It’s available in merge requests, but also available alongside the plain text editor in issues and epics.

We plan to have the rich text editor available in more areas of GitLab soon and we are actively working on that. You can follow our progress here.

https://about.gitlab.com/images/16_2/knowledge-suggest-changes.png -- Interactive diff suggestions in merge requests

See Documentation and Issue.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • Wow! From the issue I understand that this feature disappeared accidentally, I am pretty sure it was there some 6 - 7 years ago when I used gitlab! – Kostas Jan 05 '22 at 15:46
  • But, based on your answer I understand that 14.6 fixes the issue? – Kostas Jan 06 '22 at 21:04
  • @Kostas Yes, sorry, I mixed up my comments. (I have deleted my previous one) – VonC Jan 06 '22 at 21:22
  • I asked our admin to update our gitlab, but the code changes still do not appear. Is there a setting I can use to enable this? – Kostas Jan 12 '22 at 10:38
  • 1
    @Kostas There should not be any particular setting to add on the client side: the web page should reflect the new feature. – VonC Jan 12 '22 at 11:08