Multiple discussions per line in merge request diffs
In order
- https://gitlab.com/gitlab-org/gitlab-ce/issues/30299
- https://gitlab.com/gitlab-org/gitlab-ce/issues/32451
- https://gitlab.com/gitlab-org/gitlab-ce/issues/32452
Description
- Currently in merge request diffs, you can start a vertical line of comments. This is essentially one discussion.
- Enable the ability to branch out to multiple discussions, as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/30299.
- For each of those discussions, enable resovlability, as in https://gitlab.com/gitlab-org/gitlab-ce/issues/32451.
- Remove the ability to resolve individual comments. Going forward, you can only resolve entire discussions.
Activity
mentioned in issue #32451 (moved)
added ~874211 diff ~13921 labels
Update mockups! cc @DouweM
mentioned in issue #30299 (moved)
@tauriedavis Don't you think there should be a little bit of padding between the 2 discussions, even if it's just 10px? The double border looks "wrong".
assigned to @tauriedavis
changed milestone to %Backlog
-
Diff discussions are a little more complicated that other discussions since you are commenting on a specific item with the merge request. I've used the same design, though. So you can see that there is a root comment on a line, and you can reply to the root comment.
If there is only a root comment, you see the reply panel so you can easily reply, resolve, jump to the next discussion, and make an issue from the unresolved comments (just as you can with mr/issue discussions).
Currently, you can toggle the discussion using the "Toggle discussion" button on the right hand side. I changed this to toggling the file so it matches the design of toggling replies.
If a diff discussion has been resolved, it will be collapsed by default and say who resolved it.
Edited by Taurie Davis @tauriedavis It is more consistent, but I think the double nesting looks a bit weird, especially on the Discussions tab. On the Diffs tab, it makes more sense, since we can have multiple discussions per line, but that's still the exception rather than the rule.
I don't have any great suggestions, those are just some initial thoughts. :)
-
I thought that at first, but I've looked at this for so long that I'm use to it now and it doesn't look weird. Lets see if @pedroms has some suggestions with his fresh eyes.
@tauriedavis I also have doubts about the double nesting… but I don't have any suggestions yet. I'll look into this a bit more. What I'm thinking is turning the whole avatar, “started discussion…”, and the file name, into a expand/collapse toggle.
In terms of the collapsing behavior, I don't think the toggle is needed for single discussions. If you expand a line with only 1 discussion, the replies would be expanded, without any toggle. If you expanded a line with 2 or more discussions, the replies would be collapsed, with the ability to expand and collapse back again.
added UX label
assigned to @pedroms
mentioned in issue ux-research#21
moved to gitlab#9932
Hey!
GitLab is moving all development for both GitLab Community Edition and Enterprise Edition into a single codebase. The current
gitlab-cerepository will become a read-only mirror, without any proprietary code. All development is moved to the currentgitlab-eerepository, which we will rename to justgitlabin the coming weeks. As part of this migration, issues will be moved to the currentgitlab-eeproject.If you have any questions about all of this, please ask them in our dedicated FAQ issue.
https://gitlab.com/gitlab-org/gitlab-ee/issues/13855You can also find more information here:
https://gitlab.com/gitlab-org/gitlab-ee/issues/13304- https://about.gitlab.com/2019/08/23/a-single-codebase-for-gitlab-community-and-enterprise-edition/
Frequently Asked Questions
For an up to date list of questions and answers, please take a look at
https://gitlab.com/gitlab-org/gitlab-ee/issues/13855What will we do with the repository names?
https://gitlab.com/gitlab-org/gitlab-ee/ will become https://gitlab.com/gitlab-org/gitlab, and https://gitlab.com/gitlab-org/gitlab-ce will become https://gitlab.com/gitlab-org/gitlab-foss.
Why rename gitlab-ce to gitlab-foss?
Using "gitlab" and "gitlab-ce" would be confusing, so we decided to rename gitlab-ce to gitlab-foss to make the purpose of this FOSS repository more clear
I created a merge requests for CE, and this got closed. What do I need to do?
You will need to create a merge request at https://gitlab.com/gitlab-org/gitlab-ee/. This link will eventually redirect to https://gitlab.com/gitlab-org/gitlab.
How does the licensing work in this new setup?
Everything in the
ee/directory is proprietary. Everything else is free and open source software. If your merge request does not change anything in theee/directory, the process of contributing changes is the same as when using the gitlab-ce repository.Will you accept merge requests on the gitlab-ce/gitlab-foss project after it has been renamed?
No. Merge requests submitted to this project will be closed automatically.
Will I still be able to view old issues and merge requests in gitlab-ce/gitlab-foss?
Yes.
How will this affect users of GitLab CE using Omnibus?
No changes will be necessary, as the packages built remain the same.
How will this affect users of GitLab CE that build from source?
Once the project has been renamed, you will need to change your Git remotes to use this new URL. GitLab will take care of redirecting Git operations so there is no hard deadline, but we recommend doing this as soon as the projects have been renamed.
Where can I see a timeline of the remaining steps?
https://gitlab.com/gitlab-org/gitlab-ee/issues/13304Will community contributions submitted to the new "gitlab" repository be available in the new gitlab-foss repository?
Yes, these changes will be synced to gitlab-foss automatically, several times per day.
