@joseph.heenan @balagansky-work @marc_shaw I have created Rebase & Merge - Support having the option to r... (#593850) to discuss making it clearer that there is an option to rebase with pipeline.

@marc_shaw Based on the feedback, I created this issue. Could you review the proposal to see if it makes sense?

FYI @phikai

@marc_shaw Thanks for the ping - will look into it this week

@psjakubowska Created this issue Follow-up: Navigating back from the edit file t... (#593723)

Approving

What does this MR do and why?

Redirect the user back to MR on blob edit cancel

References

#579535

Screenshots or screen recordings

Before	After

How to set up and validate locally

1. Checkout this branch and run gdk locally
2. Go to any project's MR list page Code > Merge requests
3. Open any single MR and go to Changes tab
4. Click three dot menu on any file and Click Edit in single-file editor button
5. And once in edit mode and click Cancel button and confirm by clicking OK button
6. Notice now you are redirected back to the MR page
7. Compare the same to master branch where user where instead redirected to repository page with that file open

@sayobittencourt I was suggesting using the single label instead of displaying all of the icons.

It's a lot of repeation at the moment.

@clavimoniere I am a 5 out of 10 on this suggestion since I understand the intent on using the icon but I don't think it is necessary. Hence the "non-blocking".

issue The empty state should have some info on how this linking could work since you can't add/remove from the sidebar

We could add an info icon button to show a popover to explain how this works.

@ntepluhina Took a look at the changes and it is looking good so far.

Regarding the style for the heading I am gonna get some feedback from other designers.

I also added some extra suggestions that I am open to explore further.

@nickleonard Let me know what you think on these suggestions.

issue When collapsed "X items" does not convey enough information at a glance.

We could show the text Closing 2, Mentioned 2

Another approach could be to make each list independent of each other.

suggestion We should have the popover to show the details of the work item

This could be the standard popover we use for work items.

suggestion (non-blocking) Is it possible to add text above the help links to say "Links open in a tab"?

It is already sectioned off so scope would be contained to the help links.

@jerasmus noted: I think it looks more like that because the last age indicator almost looks like the background color of the toolbar area.

This might be mitigated in the future if there are plans for the Preferences menu button to be dedicated to handle other things like font-size. In this scenario, I would see the preferences menu button potentially moving to the right most since it would be persistent always. See related comment https://gitlab.com/gitlab-org/gitlab/-/work_items/541179#note_3144580516

We didn't go with the preference button to the right at this time because it only appears when inline blame is selected.

@daniel.moses This functionality to have access to the "approve" a merge request is already there if you are assigning reviewers when doing merge request reviews.

When submitting a review, you have the option to comment, approve, or request changes.

Let me know if that fits in with your team's workflow.

@ntepluhina I'll do a review of what's there today and I'll get back to you.

@clavimoniere Thank you for assisting. I will create a doc of known things that the team are working on and will schedule a sync call with you next week to see if you have any questions.

@gdoyle Any questions out of left field will probably be handled by the group or deferred

@therealrinku suggestion When navigating back to the merge request, it would be nice if we could go back to the specific file diff that you initiated the action from

The link exists as it would be similar to the one that exist when you get the link from the browser while on the Changes tab

Could you please assess to see if this is possible to do as part of this change or whether it should be handled in a separate MR?