Skip to content
Snippets Groups Projects
Commit 24a5fe6b authored by Michel Engelen's avatar Michel Engelen Committed by Achilleas Pipinellis
Browse files

Rename "discussions" to "threads" in docs

parent 03c307b6
No related branches found
No related tags found
No related merge requests found
Showing
with 127 additions and 127 deletions
Loading
Loading
@@ -108,7 +108,7 @@ The following documentation relates to the DevOps **Plan** stage:
| Plan Topics | Description |
|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------|
| [Burndown Charts](user/project/milestones/burndown_charts.md) **(STARTER)** | Watch your project's progress throughout a specific milestone. |
| [Discussions](user/discussions/index.md) | Threads, comments, and resolvable discussions in issues, commits, and merge requests. |
| [Discussions](user/discussions/index.md) | Threads, comments, and resolvable threads in issues, commits, and merge requests. |
| [Due Dates](user/project/issues/due_dates.md) | Keep track of issue deadlines. |
| [Epics](user/group/epics/index.md) **(ULTIMATE)** | Tracking groups of issues that share a theme. |
| [Issues](user/project/issues/index.md), including [confidential issues](user/project/issues/confidential_issues.md),<br/>[issue and merge request templates](user/project/description_templates.md),<br/>and [moving issues](user/project/issues/managing_issues.md#moving-issues) | Project issues, restricting access to issues, create templates for submitting new issues and merge requests, and moving issues between projects. |
Loading
Loading
@@ -192,7 +192,7 @@ The following documentation relates to the DevOps **Create** stage:
|:------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------|
| [Checking out merge requests locally](user/project/merge_requests/index.md#checkout-merge-requests-locally) | Tips for working with merge requests locally. |
| [Cherry-picking](user/project/merge_requests/cherry_pick_changes.md) | Use GitLab for cherry-picking changes. |
| [Merge request discussion resolution](user/discussions/index.md#moving-a-single-discussion-to-a-new-issue) | Resolve discussions, move discussions in a merge request to an issue, and only allow merge requests to be merged if all discussions are resolved. |
| [Merge request thread resolution](user/discussions/index.md#moving-a-single-thread-to-a-new-issue) | Resolve threads, move threads in a merge request to an issue, and only allow merge requests to be merged if all threads are resolved. |
| [Merge requests](user/project/merge_requests/index.md) | Merge request management. |
| [Work In Progress "WIP" merge requests](user/project/merge_requests/work_in_progress_merge_requests.md) | Prevent merges of work-in-progress merge requests. |
 
Loading
Loading
This diff is collapsed.
Loading
Loading
@@ -207,9 +207,9 @@ first time.
- Extract unrelated changes and refactorings into future merge requests/issues.
- Seek to understand the reviewer's perspective.
- Try to respond to every comment.
- The merge request author resolves only the discussions they have fully
addressed. If there's an open reply, an open discussion, a suggestion,
a question, or anything else, the discussion should be left to be resolved
- The merge request author resolves only the threads they have fully
addressed. If there's an open reply, an open thread, a suggestion,
a question, or anything else, the thread should be left to be resolved
by the reviewer.
- Push commits based on earlier rounds of feedback as isolated commits to the
branch. Do not squash until the branch is ready to merge. Reviewers should be
Loading
Loading
Loading
Loading
@@ -248,8 +248,8 @@ If a bug seems to fall between two severity labels, assign it to the higher-seve
- Example(s) of ~S1
- Data corruption/loss.
- Security breach.
- Unable to create an issue or merge request.
- Unable to add a comment or discussion to the issue or merge request.
- Unable to create an issue or merge request.
- Unable to add a comment or thread to the issue or merge request.
- Example(s) of ~S2
- Cannot submit changes through the web IDE but the commandline works.
- A status widget on the merge request page is not working but information can be seen in the test pipeline page.
Loading
Loading
Loading
Loading
@@ -74,10 +74,10 @@ request is as follows:
can be found by running `grep css-class ./app -R`.
1. Be prepared to answer questions and incorporate feedback into your MR with new
commits. Once you have fully addressed a suggestion from a reviewer, click the
"Resolve discussion" button beneath it to mark it resolved.
1. The merge request author resolves only the discussions they have fully addressed.
If there's an open reply or discussion, a suggestion, a question, or anything else,
the discussion should be left to be resolved by the reviewer.
"Resolve thread" button beneath it to mark it resolved.
1. The merge request author resolves only the threads they have fully addressed.
If there's an open reply or thread, a suggestion, a question, or anything else,
the thread should be left to be resolved by the reviewer.
1. If your MR touches code that executes shell commands, reads or opens files, or
handles paths to files on disk, make sure it adheres to the
[shell command guidelines](../shell_commands.md)
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@
 
When you're collaborating online, you get fewer opportunities for high-fives
and thumbs-ups. Emoji can be awarded to [issues](project/issues/index.md), [merge requests](project/merge_requests/index.md),
[snippets](snippets.md), and anywhere you can have a discussion.
[snippets](snippets.md), and anywhere you can have a thread.
 
![Award emoji](img/award_emoji_select.png)
 
Loading
Loading
doc/user/discussions/img/automatically_resolve_outdated_discussions.png

37.1 KiB | W: 1258px | H: 526px

doc/user/discussions/img/automatically_resolve_outdated_discussions.png

56.3 KiB | W: 1248px | H: 248px

doc/user/discussions/img/automatically_resolve_outdated_discussions.png
doc/user/discussions/img/automatically_resolve_outdated_discussions.png
doc/user/discussions/img/automatically_resolve_outdated_discussions.png
doc/user/discussions/img/automatically_resolve_outdated_discussions.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/btn_new_issue_for_all_discussions.png

9.33 KiB

doc/user/discussions/img/btn_new_issue_for_all_threads.png

19 KiB

doc/user/discussions/img/commit_comment_mr_context.png

25.2 KiB | W: 982px | H: 538px

doc/user/discussions/img/commit_comment_mr_context.png

357 KiB | W: 1944px | H: 1490px

doc/user/discussions/img/commit_comment_mr_context.png
doc/user/discussions/img/commit_comment_mr_context.png
doc/user/discussions/img/commit_comment_mr_context.png
doc/user/discussions/img/commit_comment_mr_context.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/commit_comment_mr_discussions_tab.png

14.8 KiB | W: 954px | H: 290px

doc/user/discussions/img/commit_comment_mr_discussions_tab.png

270 KiB | W: 1958px | H: 1158px

doc/user/discussions/img/commit_comment_mr_discussions_tab.png
doc/user/discussions/img/commit_comment_mr_discussions_tab.png
doc/user/discussions/img/commit_comment_mr_discussions_tab.png
doc/user/discussions/img/commit_comment_mr_discussions_tab.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/discussion_comment.png

36.5 KiB | W: 1936px | H: 582px

doc/user/discussions/img/discussion_comment.png

59.1 KiB | W: 1930px | H: 330px

doc/user/discussions/img/discussion_comment.png
doc/user/discussions/img/discussion_comment.png
doc/user/discussions/img/discussion_comment.png
doc/user/discussions/img/discussion_comment.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/discussion_view.png

72.1 KiB

doc/user/discussions/img/image_resolved_discussion.png

47.1 KiB | W: 1930px | H: 1112px

doc/user/discussions/img/image_resolved_discussion.png

195 KiB | W: 1846px | H: 996px

doc/user/discussions/img/image_resolved_discussion.png
doc/user/discussions/img/image_resolved_discussion.png
doc/user/discussions/img/image_resolved_discussion.png
doc/user/discussions/img/image_resolved_discussion.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/merge_request_commits_tab.png

12.5 KiB | W: 990px | H: 240px

doc/user/discussions/img/merge_request_commits_tab.png

165 KiB | W: 1954px | H: 574px

doc/user/discussions/img/merge_request_commits_tab.png
doc/user/discussions/img/merge_request_commits_tab.png
doc/user/discussions/img/merge_request_commits_tab.png
doc/user/discussions/img/merge_request_commits_tab.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/mr_review_resolve.png

21.4 KiB | W: 705px | H: 531px

doc/user/discussions/img/mr_review_resolve.png

242 KiB | W: 1898px | H: 1228px

doc/user/discussions/img/mr_review_resolve.png
doc/user/discussions/img/mr_review_resolve.png
doc/user/discussions/img/mr_review_resolve.png
doc/user/discussions/img/mr_review_resolve.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/mr_review_resolve2.png

9.21 KiB | W: 656px | H: 198px

doc/user/discussions/img/mr_review_resolve2.png

227 KiB | W: 1906px | H: 886px

doc/user/discussions/img/mr_review_resolve2.png
doc/user/discussions/img/mr_review_resolve2.png
doc/user/discussions/img/mr_review_resolve2.png
doc/user/discussions/img/mr_review_resolve2.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/mr_review_second_comment.png

10.9 KiB | W: 700px | H: 363px

doc/user/discussions/img/mr_review_second_comment.png

179 KiB | W: 1892px | H: 816px

doc/user/discussions/img/mr_review_second_comment.png
doc/user/discussions/img/mr_review_second_comment.png
doc/user/discussions/img/mr_review_second_comment.png
doc/user/discussions/img/mr_review_second_comment.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/mr_review_second_comment_added.png

9.45 KiB | W: 668px | H: 216px

doc/user/discussions/img/mr_review_second_comment_added.png

158 KiB | W: 1888px | H: 476px

doc/user/discussions/img/mr_review_second_comment_added.png
doc/user/discussions/img/mr_review_second_comment_added.png
doc/user/discussions/img/mr_review_second_comment_added.png
doc/user/discussions/img/mr_review_second_comment_added.png
  • 2-up
  • Swipe
  • Onion skin
doc/user/discussions/img/mr_review_start.png

22.9 KiB | W: 702px | H: 553px

doc/user/discussions/img/mr_review_start.png

268 KiB | W: 1876px | H: 1274px

doc/user/discussions/img/mr_review_start.png
doc/user/discussions/img/mr_review_start.png
doc/user/discussions/img/mr_review_start.png
doc/user/discussions/img/mr_review_start.png
  • 2-up
  • Swipe
  • Onion skin
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment