Commit 24a5fe6b authored by Michel Engelen's avatar Michel Engelen Committed by Achilleas Pipinellis

Rename "discussions" to "threads" in docs

parent 03c307b6
...@@ -108,7 +108,7 @@ The following documentation relates to the DevOps **Plan** stage: ...@@ -108,7 +108,7 @@ The following documentation relates to the DevOps **Plan** stage:
| Plan Topics | Description | | Plan Topics | Description |
|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------| |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------|
| [Burndown Charts](user/project/milestones/burndown_charts.md) **(STARTER)** | Watch your project's progress throughout a specific milestone. | | [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. | | [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. | | [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. | | [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. |
...@@ -192,7 +192,7 @@ The following documentation relates to the DevOps **Create** stage: ...@@ -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. | | [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. | | [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. | | [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. | | [Work In Progress "WIP" merge requests](user/project/merge_requests/work_in_progress_merge_requests.md) | Prevent merges of work-in-progress merge requests. |
......
This diff is collapsed.
...@@ -207,9 +207,9 @@ first time. ...@@ -207,9 +207,9 @@ first time.
- Extract unrelated changes and refactorings into future merge requests/issues. - Extract unrelated changes and refactorings into future merge requests/issues.
- Seek to understand the reviewer's perspective. - Seek to understand the reviewer's perspective.
- Try to respond to every comment. - Try to respond to every comment.
- The merge request author resolves only the discussions they have fully - The merge request author resolves only the threads they have fully
addressed. If there's an open reply, an open discussion, a suggestion, addressed. If there's an open reply, an open thread, a suggestion,
a question, or anything else, the discussion should be left to be resolved a question, or anything else, the thread should be left to be resolved
by the reviewer. by the reviewer.
- Push commits based on earlier rounds of feedback as isolated commits to the - 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 branch. Do not squash until the branch is ready to merge. Reviewers should be
......
...@@ -249,7 +249,7 @@ If a bug seems to fall between two severity labels, assign it to the higher-seve ...@@ -249,7 +249,7 @@ If a bug seems to fall between two severity labels, assign it to the higher-seve
- Data corruption/loss. - Data corruption/loss.
- Security breach. - Security breach.
- Unable to create an issue or merge request. - Unable to create an issue or merge request.
- Unable to add a comment or discussion to the issue or merge request. - Unable to add a comment or thread to the issue or merge request.
- Example(s) of ~S2 - Example(s) of ~S2
- Cannot submit changes through the web IDE but the commandline works. - 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. - A status widget on the merge request page is not working but information can be seen in the test pipeline page.
......
...@@ -74,10 +74,10 @@ request is as follows: ...@@ -74,10 +74,10 @@ request is as follows:
can be found by running `grep css-class ./app -R`. can be found by running `grep css-class ./app -R`.
1. Be prepared to answer questions and incorporate feedback into your MR with new 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 commits. Once you have fully addressed a suggestion from a reviewer, click the
"Resolve discussion" button beneath it to mark it resolved. "Resolve thread" button beneath it to mark it resolved.
1. The merge request author resolves only the discussions they have fully addressed. 1. The merge request author resolves only the threads they have fully addressed.
If there's an open reply or discussion, a suggestion, a question, or anything else, If there's an open reply or thread, a suggestion, a question, or anything else,
the discussion should be left to be resolved by the reviewer. 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 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 handles paths to files on disk, make sure it adheres to the
[shell command guidelines](../shell_commands.md) [shell command guidelines](../shell_commands.md)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
When you're collaborating online, you get fewer opportunities for high-fives 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), 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) ![Award emoji](img/award_emoji_select.png)
......
doc/user/discussions/img/swipe_view.png

16.1 KB | W: | H:

doc/user/discussions/img/swipe_view.png

69.4 KB | W: | H:

doc/user/discussions/img/swipe_view.png
doc/user/discussions/img/swipe_view.png
doc/user/discussions/img/swipe_view.png
doc/user/discussions/img/swipe_view.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
...@@ -205,12 +205,12 @@ You may also consult the [group permissions table][permissions]. ...@@ -205,12 +205,12 @@ You may also consult the [group permissions table][permissions].
These text fields also fully support These text fields also fully support
[GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm). [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm).
## Comment, or start a discussion ## Comment, or start a thread
Once you wrote your comment, you can either: Once you wrote your comment, you can either:
- Click "Comment" and your comment will be published. - Click "Comment" and your comment will be published.
- Click "Start discussion": start a thread within that epic's thread to discuss specific points. - Click "Start thread": start a thread within that epic's discussion to discuss specific points.
## Award emoji ## Award emoji
......
...@@ -124,12 +124,12 @@ merge requests, code snippets, and commits. ...@@ -124,12 +124,12 @@ merge requests, code snippets, and commits.
When performing inline reviews to implementations When performing inline reviews to implementations
to your codebase through merge requests you can to your codebase through merge requests you can
gather feedback through [resolvable discussions](discussions/index.md#resolvable-comments-and-discussions). gather feedback through [resolvable threads](discussions/index.md#resolvable-comments-and-threads).
### GitLab Flavored Markdown (GFM) ### GitLab Flavored Markdown (GFM)
Read through the [GFM documentation](markdown.md) to learn how to apply Read through the [GFM documentation](markdown.md) to learn how to apply
the best of GitLab Flavored Markdown in your discussions, comments, the best of GitLab Flavored Markdown in your threads, comments,
issues and merge requests descriptions, and everywhere else GMF is issues and merge requests descriptions, and everywhere else GMF is
supported. supported.
...@@ -148,7 +148,7 @@ requests you're assigned to. ...@@ -148,7 +148,7 @@ requests you're assigned to.
[Snippets](snippets.md) are code blocks that you want to store in GitLab, from which [Snippets](snippets.md) are code blocks that you want to store in GitLab, from which
you have quick access to. You can also gather feedback on them through you have quick access to. You can also gather feedback on them through
[discussions](#discussions). [Discussions](#Discussions).
## Integrations ## Integrations
......
...@@ -60,7 +60,7 @@ The following table depicts the various user permission levels in a project. ...@@ -60,7 +60,7 @@ The following table depicts the various user permission levels in a project.
| View confidential issues | (*2*) | ✓ | ✓ | ✓ | ✓ | | View confidential issues | (*2*) | ✓ | ✓ | ✓ | ✓ |
| Assign issues | | ✓ | ✓ | ✓ | ✓ | | Assign issues | | ✓ | ✓ | ✓ | ✓ |
| Label issues | | ✓ | ✓ | ✓ | ✓ | | Label issues | | ✓ | ✓ | ✓ | ✓ |
| Lock issue discussions | | ✓ | ✓ | ✓ | ✓ | | Lock issue threads | | ✓ | ✓ | ✓ | ✓ |
| Manage issue tracker | | ✓ | ✓ | ✓ | ✓ | | Manage issue tracker | | ✓ | ✓ | ✓ | ✓ |
| Manage related issues **(STARTER)** | | ✓ | ✓ | ✓ | ✓ | | Manage related issues **(STARTER)** | | ✓ | ✓ | ✓ | ✓ |
| Create issue from vulnerability **(ULTIMATE)** | | ✓ | ✓ | ✓ | ✓ | | Create issue from vulnerability **(ULTIMATE)** | | ✓ | ✓ | ✓ | ✓ |
...@@ -81,7 +81,7 @@ The following table depicts the various user permission levels in a project. ...@@ -81,7 +81,7 @@ The following table depicts the various user permission levels in a project.
| Create new merge request | | | ✓ | ✓ | ✓ | | Create new merge request | | | ✓ | ✓ | ✓ |
| Assign merge requests | | | ✓ | ✓ | ✓ | | Assign merge requests | | | ✓ | ✓ | ✓ |
| Label merge requests | | | ✓ | ✓ | ✓ | | Label merge requests | | | ✓ | ✓ | ✓ |
| Lock merge request discussions | | | ✓ | ✓ | ✓ | | Lock merge request threads | | | ✓ | ✓ | ✓ |
| Manage/Accept merge requests | | | ✓ | ✓ | ✓ | | Manage/Accept merge requests | | | ✓ | ✓ | ✓ |
| Create new environments | | | ✓ | ✓ | ✓ | | Create new environments | | | ✓ | ✓ | ✓ |
| Stop environments | | | ✓ | ✓ | ✓ | | Stop environments | | | ✓ | ✓ | ✓ |
......
...@@ -24,9 +24,8 @@ Import your projects from Bitbucket Server to GitLab with minimal effort. ...@@ -24,9 +24,8 @@ Import your projects from Bitbucket Server to GitLab with minimal effort.
1. Currently GitLab doesn't allow comments on arbitrary lines of code, so any 1. Currently GitLab doesn't allow comments on arbitrary lines of code, so any
Bitbucket comments out of bounds will be inserted as comments in the merge Bitbucket comments out of bounds will be inserted as comments in the merge
request. request.
1. Bitbucket Server allows multiple levels of threading. GitLab 1. Bitbucket Server allows multiple levels of threading. GitLab import
import will collapse this into one discussion and quote part of the original will collapse this into one thread and quote part of the original comment.
comment.
1. Declined pull requests have unreachable commits, which prevents the GitLab 1. Declined pull requests have unreachable commits, which prevents the GitLab
importer from generating a proper diff. These pull requests will show up as importer from generating a proper diff. These pull requests will show up as
empty changes. empty changes.
......
...@@ -221,7 +221,7 @@ There are numerous [APIs](../../api/README.md) to use with your projects: ...@@ -221,7 +221,7 @@ There are numerous [APIs](../../api/README.md) to use with your projects:
- [Badges](../../api/project_badges.md) - [Badges](../../api/project_badges.md)
- [Clusters](../../api/project_clusters.md) - [Clusters](../../api/project_clusters.md)
- [Discussions](../../api/discussions.md) - [Threads](../../api/discussions.md)
- [General](../../api/projects.md) - [General](../../api/projects.md)
- [Import/export](../../api/project_import_export.md) - [Import/export](../../api/project_import_export.md)
- [Issue Board](../../api/boards.md) - [Issue Board](../../api/boards.md)
......
...@@ -116,13 +116,13 @@ issue boards or the issue list. ...@@ -116,13 +116,13 @@ issue boards or the issue list.
#### 11. Lock issue #### 11. Lock issue
You can [lock the discussions](../../discussions/index.md#lock-discussions) in the issue, You can [lock the threads](../../discussions/index.md#lock-discussions) in the issue,
to prevent further comments from being added. to prevent further comments from being added.
#### 12. Participants #### 12. Participants
All the users involved in that issue. Either they participated in the [discussion](../../discussions/index.md), All the users involved in that issue. Either they participated in the [thread](../../discussions/index.md),
or were mentioned in the description or discussions. or were mentioned in the description or threads.
#### 13. Notifications #### 13. Notifications
...@@ -187,8 +187,8 @@ You can also click the `+` to add more related issues. ...@@ -187,8 +187,8 @@ You can also click the `+` to add more related issues.
#### 19. Related Merge Requests #### 19. Related Merge Requests
Merge requests that were mentioned in that issue's description or in the issue discussion Merge requests that were mentioned in that issue's description or in the issue thread
thread are listed as [related merge requests](crosslinking_issues.md#from-merge-requests) here. are listed as [related merge requests](crosslinking_issues.md#from-merge-requests) here.
Also, if the current issue was mentioned as related in another merge request, that Also, if the current issue was mentioned as related in another merge request, that
merge request will be listed here. merge request will be listed here.
...@@ -200,14 +200,14 @@ dropdown list of available [GitLab Flavored Markdown Emoji](../../markdown.md#em ...@@ -200,14 +200,14 @@ dropdown list of available [GitLab Flavored Markdown Emoji](../../markdown.md#em
TIP: **Tip:** TIP: **Tip:**
Posting "+1" as a comment in a thread spams all subscribed participants of that issue, Posting "+1" as a comment in a thread spams all subscribed participants of that issue,
clutters the discussion threads, and is not recommended. Awarding an emoji is a way clutters the threads, and is not recommended. Awarding an emoji is a way
to let them know your reaction without spamming them. to let them know your reaction without spamming them.
#### 21. Show all activity #### 21. Show all activity
You can filter what is displayed in the issue history by clicking on **Show all activity** You can filter what is displayed in the issue history by clicking on **Show all activity**
and selecting either **Show comments only**, which only shows discussions and hides and selecting either **Show comments only**, which only shows threads and hides
updates to the issue, or **Show history only**, which hides discussions and only shows updates. updates to the issue, or **Show history only**, which hides threads and only shows updates.
- You can mention a user or a group present in your GitLab instance with - You can mention a user or a group present in your GitLab instance with
`@username` or `@groupname` and they will be notified via To-Do items `@username` or `@groupname` and they will be notified via To-Do items
...@@ -242,15 +242,15 @@ filtered, as shown above. ...@@ -242,15 +242,15 @@ filtered, as shown above.
Collaborate in the issue by posting comments in its thread. This text field also fully Collaborate in the issue by posting comments in its thread. This text field also fully
supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm). supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm).
#### 25. Submit Comment, start a discussion, or comment and close #### 25. Submit Comment, start a thread, or comment and close
Once you write a comment, you can: Once you write a comment, you can:
- Click **Comment** and your comment will be published. - Click **Comment** and your comment will be published.
- Choose **Start discussion** from the dropdown list and start a new [discussion thread](../../discussions/index.md#threaded-discussions) - Choose **Start thread** from the dropdown list and start a new [thread](../../discussions/index.md#threaded-discussions)
within that issue's main thread to discuss specific points. This invites other participants within that issue's main thread to discuss specific points. This invites other participants
to reply directly to your discussion, keeping related comments grouped together. to reply directly to your thread, keeping related comments grouped together.
![Comment or discussion](img/comment-or-discussion.png) ![Comment or thread](img/comment-or-discussion.png)
You can also close the issue from here, so you don't need to scroll to the top of the issue page. You can also close the issue from here, so you don't need to scroll to the top of the issue page.
...@@ -18,7 +18,7 @@ It is as simple as the name implies: a _request_ to _merge_ one branch into anot ...@@ -18,7 +18,7 @@ It is as simple as the name implies: a _request_ to _merge_ one branch into anot
With GitLab merge requests, you can: With GitLab merge requests, you can:
- Compare the changes between two [branches](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell#_git_branching) - Compare the changes between two [branches](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell#_git_branching)
- [Review and discuss](../../discussions/index.md#discussions) the proposed modifications inline - [Review and discuss](../../discussions/index.md#threads) the proposed modifications inline
- Live preview the changes when [Review Apps](../../../ci/review_apps/index.md) is configured for your project - Live preview the changes when [Review Apps](../../../ci/review_apps/index.md) is configured for your project
- Build, test, and deploy your code in a per-branch basis with built-in [GitLab CI/CD](../../../ci/README.md) - Build, test, and deploy your code in a per-branch basis with built-in [GitLab CI/CD](../../../ci/README.md)
- Prevent the merge request from being merged before it's ready with [WIP MRs](#work-in-progress-merge-requests) - Prevent the merge request from being merged before it's ready with [WIP MRs](#work-in-progress-merge-requests)
...@@ -155,13 +155,13 @@ and remember to merge the request manually. ...@@ -155,13 +155,13 @@ and remember to merge the request manually.
[Learn more about merging when pipeline succeeds.](merge_when_pipeline_succeeds.md) [Learn more about merging when pipeline succeeds.](merge_when_pipeline_succeeds.md)
## Resolve discussion comments in merge requests reviews ## Resolve threads in merge requests reviews
Keep track of the progress during a code review with resolving comments. Keep track of the progress during a code review with resolving comments.
Resolving comments prevents you from forgetting to address feedback and lets Resolving comments prevents you from forgetting to address feedback and lets
you hide discussions that are no longer relevant. you hide threads that are no longer relevant.
[Read more about resolving discussion comments in merge requests reviews.](../../discussions/index.md) [Read more about resolving threads in merge requests reviews.](../../discussions/index.md)
## Commenting on any file line in merge requests ## Commenting on any file line in merge requests
...@@ -192,7 +192,7 @@ commit when merging, to allow for a neater commit history. ...@@ -192,7 +192,7 @@ commit when merging, to allow for a neater commit history.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/18008) in GitLab 11.6. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/18008) in GitLab 11.6.
As a reviewer, you can add suggestions to change the content in As a reviewer, you can add suggestions to change the content in
merge request discussions, and users with appropriate [permission](../../permissions.md) merge request threads, and users with appropriate [permission](../../permissions.md)
can easily apply them to the codebase directly from the UI. Read can easily apply them to the codebase directly from the UI. Read
through the documentation on [Suggest changes](../../discussions/index.md#suggest-changes) through the documentation on [Suggest changes](../../discussions/index.md#suggest-changes)
to learn more. to learn more.
......
...@@ -162,7 +162,7 @@ the merge request is unblocked and can be merged. ...@@ -162,7 +162,7 @@ the merge request is unblocked and can be merged.
Note, that meeting the required number of approvals is a necessary, but not Note, that meeting the required number of approvals is a necessary, but not
sufficient condition for unblocking a merge request from being merged. There sufficient condition for unblocking a merge request from being merged. There
are other conditions that may block it, such as merge conflicts, are other conditions that may block it, such as merge conflicts,
[pending discussions](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-discussions-are-resolved) [pending discussions](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved)
or a [failed CI/CD pipeline](merge_when_pipeline_succeeds.md). or a [failed CI/CD pipeline](merge_when_pipeline_succeeds.md).
## Code Owners approvals **(PREMIUM)** ## Code Owners approvals **(PREMIUM)**
......
...@@ -36,7 +36,7 @@ changes to be reviewed. ...@@ -36,7 +36,7 @@ changes to be reviewed.
## Only allow merge requests to be merged if the pipeline succeeds ## Only allow merge requests to be merged if the pipeline succeeds
You can prevent merge requests from being merged if their pipeline did not succeed You can prevent merge requests from being merged if their pipeline did not succeed
or if there are discussions to be resolved. or if there are threads to be resolved.
Navigate to your project's settings page and expand the **Merge requests** section. Navigate to your project's settings page and expand the **Merge requests** section.
In the **Merge checks** subsection, select the **Pipelines must succeed** check In the **Merge checks** subsection, select the **Pipelines must succeed** check
......
...@@ -5,7 +5,7 @@ type: reference, concepts ...@@ -5,7 +5,7 @@ type: reference, concepts
# "Work In Progress" merge requests # "Work In Progress" merge requests
If a merge request is not yet ready to be merged, perhaps due to continued development If a merge request is not yet ready to be merged, perhaps due to continued development
or open discussions, you can prevent it from being accepted before it's ready by flagging or open threads, you can prevent it from being accepted before it's ready by flagging
it as a **Work In Progress**. This will disable the "Merge" button, preventing it from it as a **Work In Progress**. This will disable the "Merge" button, preventing it from
being merged, and it will stay disabled until the "WIP" flag has been removed. being merged, and it will stay disabled until the "WIP" flag has been removed.
...@@ -19,7 +19,7 @@ There are several ways to flag a merge request as a Work In Progress: ...@@ -19,7 +19,7 @@ There are several ways to flag a merge request as a Work In Progress:
**Start the title with WIP:**, under the title box, when editing the merge request's **Start the title with WIP:**, under the title box, when editing the merge request's
description will have the same effect. description will have the same effect.
- Add the `/wip` [quick action](../quick_actions.md#quick-actions-for-issues-and-merge-requests) - Add the `/wip` [quick action](../quick_actions.md#quick-actions-for-issues-and-merge-requests)
in a discussion comment in the merge request. This is a toggle, and can be repeated in a comment in the merge request. This is a toggle, and can be repeated
to change the status back. Note that any other text in the comment will be discarded. to change the status back. Note that any other text in the comment will be discarded.
- Add "wip" or "WIP" to the start of a commit message targeting the merge request's - Add "wip" or "WIP" to the start of a commit message targeting the merge request's
source branch. This is not a toggle, and doing it again in another commit will have source branch. This is not a toggle, and doing it again in another commit will have
...@@ -34,7 +34,7 @@ Similar to above, when a Merge Request is ready to be merged, you can remove the ...@@ -34,7 +34,7 @@ Similar to above, when a Merge Request is ready to be merged, you can remove the
**Remove the WIP: prefix from the title**, under the title box, when editing the merge **Remove the WIP: prefix from the title**, under the title box, when editing the merge
request's description, will have the same effect. request's description, will have the same effect.
- Add the `/wip` [quick action](../quick_actions.md#quick-actions-for-issues-and-merge-requests) - Add the `/wip` [quick action](../quick_actions.md#quick-actions-for-issues-and-merge-requests)
in a discussion comment in the merge request. This is a toggle, and can be repeated in a comment in the merge request. This is a toggle, and can be repeated
to change the status back. Note that any other text in the comment will be discarded. to change the status back. Note that any other text in the comment will be discarded.
- Click on the **Resolve WIP status** button near the bottom of the merge request description, - Click on the **Resolve WIP status** button near the bottom of the merge request description,
next to the "Merge" button (see [image above](#work-in-progress-merge-requests)). next to the "Merge" button (see [image above](#work-in-progress-merge-requests)).
......
...@@ -40,8 +40,8 @@ discussions, and descriptions: ...@@ -40,8 +40,8 @@ discussions, and descriptions:
| `/remove_estimate` | Remove time estimate | ✓ | ✓ | | `/remove_estimate` | Remove time estimate | ✓ | ✓ |
| <code>/spend &lt;time(1h 30m &#124; -1h 5m)&gt; &lt;date(YYYY-MM-DD)&gt;</code> | Add or subtract spent time; optionally, specify the date that time was spent on | ✓ | ✓ | | <code>/spend &lt;time(1h 30m &#124; -1h 5m)&gt; &lt;date(YYYY-MM-DD)&gt;</code> | Add or subtract spent time; optionally, specify the date that time was spent on | ✓ | ✓ |
| `/remove_time_spent` | Remove time spent | ✓ | ✓ | | `/remove_time_spent` | Remove time spent | ✓ | ✓ |
| `/lock` | Lock the discussion | ✓ | ✓ | | `/lock` | Lock the thread | ✓ | ✓ |
| `/unlock` | Unlock the discussion | ✓ | ✓ | | `/unlock` | Unlock the thread | ✓ | ✓ |
| <code>/due &lt;in 2 days &#124; this Friday &#124; December 31st&gt;</code>| Set due date | ✓ | | | <code>/due &lt;in 2 days &#124; this Friday &#124; December 31st&gt;</code>| Set due date | ✓ | |
| `/remove_due_date` | Remove due date | ✓ | | | `/remove_due_date` | Remove due date | ✓ | |
| <code>/weight &lt;0 &#124; 1 &#124; 2 &#124; ...&gt;</code> | Set weight **(STARTER)** | ✓ | | | <code>/weight &lt;0 &#124; 1 &#124; 2 &#124; ...&gt;</code> | Set weight **(STARTER)** | ✓ | |
......
...@@ -44,7 +44,7 @@ Set up your project's merge request settings: ...@@ -44,7 +44,7 @@ Set up your project's merge request settings:
- Merge request [description templates](../description_templates.md#description-templates). - Merge request [description templates](../description_templates.md#description-templates).
- Enable [merge request approvals](../merge_requests/merge_request_approvals.md). **(STARTER)** - Enable [merge request approvals](../merge_requests/merge_request_approvals.md). **(STARTER)**
- Enable [merge only of pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md). - Enable [merge only of pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md).
- Enable [merge only when all discussions are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-discussions-are-resolved). - Enable [merge only when all discussions are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved).
![project's merge request settings](img/merge_requests_settings.png) ![project's merge request settings](img/merge_requests_settings.png)
......
...@@ -38,7 +38,7 @@ comments: false ...@@ -38,7 +38,7 @@ comments: false
- [Authorization for merge requests](../user/project/merge_requests/authorization_for_merge_requests.md) - [Authorization for merge requests](../user/project/merge_requests/authorization_for_merge_requests.md)
- [Cherry-pick changes](../user/project/merge_requests/cherry_pick_changes.md) - [Cherry-pick changes](../user/project/merge_requests/cherry_pick_changes.md)
- [Merge when pipeline succeeds](../user/project/merge_requests/merge_when_pipeline_succeeds.md) - [Merge when pipeline succeeds](../user/project/merge_requests/merge_when_pipeline_succeeds.md)
- [Resolve discussion comments in merge requests reviews](../user/discussions/index.md) - [Resolve threads in merge requests reviews](../user/discussions/index.md)
- [Resolve merge conflicts in the UI](../user/project/merge_requests/resolve_conflicts.md) - [Resolve merge conflicts in the UI](../user/project/merge_requests/resolve_conflicts.md)
- [Revert changes in the UI](../user/project/merge_requests/revert_changes.md) - [Revert changes in the UI](../user/project/merge_requests/revert_changes.md)
- [Merge requests versions](../user/project/merge_requests/versions.md) - [Merge requests versions](../user/project/merge_requests/versions.md)
......
...@@ -138,7 +138,7 @@ Notification emails include headers that provide extra content about the notific ...@@ -138,7 +138,7 @@ Notification emails include headers that provide extra content about the notific
| X-GitLab-Project-Id | The ID of the project | | X-GitLab-Project-Id | The ID of the project |
| X-GitLab-Project-Path | The path of the project | | X-GitLab-Project-Path | The path of the project |
| X-GitLab-(Resource)-ID | The ID of the resource the notification is for, where resource is `Issue`, `MergeRequest`, `Commit`, etc| | X-GitLab-(Resource)-ID | The ID of the resource the notification is for, where resource is `Issue`, `MergeRequest`, `Commit`, etc|
| X-GitLab-Discussion-ID | Only in comment emails, the ID of the discussion the comment is from | | X-GitLab-Discussion-ID | Only in comment emails, the ID of the thread the comment is from |
| X-GitLab-Pipeline-Id | Only in pipeline emails, the ID of the pipeline the notification is for | | X-GitLab-Pipeline-Id | Only in pipeline emails, the ID of the pipeline the notification is for |
| X-GitLab-Reply-Key | A unique token to support reply by email | | X-GitLab-Reply-Key | A unique token to support reply by email |
| X-GitLab-NotificationReason | The reason for being notified. "mentioned", "assigned", etc | | X-GitLab-NotificationReason | The reason for being notified. "mentioned", "assigned", etc |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment