Resolved discussions not visible from the Changes tab

Summary

There is no way to view resolved discussions on the Changes tab if the code has not been obsoleted yet. This may be useful for other reviewers to see that the code has already been discussed and considered closed.

Steps to reproduce

Make a comment about some code in an MR and then mark the discussion as "resolved". View the Changes tab.

What is the current bug behavior?

Resolved discussions are not visible on the Changes tab.

What is the expected correct behavior?

It should be possible to expand resolved discussions from the Changes tab.

I reproduced in an example project:

• https://gitlab.com/issue-reproduce/resolved-discussion-diff/merge_requests/1/diffs

When resolving the discussion in the diffs tab, the discussion point remains until the page is refreshed. Is this the intended behaviour or should the discussion point reappear upon refresh?

/cc @victorwu @smcgivern

added ~874211 ~65372 code review diff labels

@markglenfletcher I think this is intentional. If you try to comment on the same line, you'll see your comment in your thread. I think there was an issue for adding indicators to those lines, to show that they had resolved discussions, but I don't know where it was. @victorwu do you know?

@smcgivern : I think there's a bug, one way or another? (Doesn't matter since it's semantics though).

When I go to https://gitlab.com/issue-reproduce/resolved-discussion-diff/merge_requests/1/diffs, comments are toggled on, by default, and I do not see the discussion on line 3. But when I toggle off and then back on, I do see the comment now.

@smcgivern : That's inconsistent I think?

@victorwu what do you mean by 'toggle off and then back on'? The rule is this: resolved comments show up only when you click on their line (if it still exists); unresolved comments show up on their line (if it still exists).

@smcgivern Oh I meant clicking this button

Aha! Right, I agree that that's a bug 🙂

related: #32125 (closed)

moved to gitlab#8258

Hey! 👋

GitLab is moving all development for both GitLab Community Edition and Enterprise Edition into a single codebase. The current gitlab-ce repository will become a read-only mirror, without any proprietary code. All development is moved to the current gitlab-ee repository, which we will rename to just gitlab in the coming weeks. As part of this migration, issues will be moved to the current gitlab-ee project.

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/13855

You 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/13855

What 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 the ee/ 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/13304

Will 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.

locked this issue