diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 21:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 21:09:35 +0300 |
| commit | 3a9076e0a4c28af9a1a40ed5e181b70fb1b659de (patch) | |
| tree | 3d531c50bec43c1845c7d74f76442b7a6f49849f /doc/university/training | |
| parent | 2d8454515e7b631a8f39a6415c86154d6c62841c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/university/training')
| -rw-r--r-- | doc/university/training/end-user/README.md | 2 | ||||
| -rw-r--r-- | doc/university/training/topics/merge_requests.md | 2 | ||||
| -rw-r--r-- | doc/university/training/user_training.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/university/training/end-user/README.md b/doc/university/training/end-user/README.md index 0465f48bb34..8d25b865855 100644 --- a/doc/university/training/end-user/README.md +++ b/doc/university/training/end-user/README.md @@ -159,7 +159,7 @@ git push origin squash_some_bugs - When you want feedback create a merge request - Target is the ‘default’ branch (usually master) - Assign or mention the person you would like to review -- Add `WIP` to the title if it's a work in progress +- Add `Draft:` to the title if it's a work in progress - When accepting, always delete the branch - Anyone can comment, not just the assignee - Push corrections to the same branch diff --git a/doc/university/training/topics/merge_requests.md b/doc/university/training/topics/merge_requests.md index 0ea8b707ea9..ea679a7d66f 100644 --- a/doc/university/training/topics/merge_requests.md +++ b/doc/university/training/topics/merge_requests.md @@ -7,7 +7,7 @@ comments: false - When you want feedback create a merge request - Target is the default branch (usually master) - Assign or mention the person you would like to review -- Add 'WIP' to the title if it's a work in progress +- Add `[Draft]` to the title if it's a work in progress - When accepting, always delete the branch - Anyone can comment, not just the assignee - Push corrections to the same branch diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md index d2def1f3199..43de90010b1 100644 --- a/doc/university/training/user_training.md +++ b/doc/university/training/user_training.md @@ -186,7 +186,7 @@ git push origin squash_some_bugs - When you want feedback create a merge request. - Target is the ‘default’ branch (usually master). - Assign or mention the person you would like to review. -- Add 'WIP' to the title if it's a work in progress. +- Add `[Draft]` to the title if it's a work in progress. - When accepting, always delete the branch. - Anyone can comment, not just the assignee. - Push corrections to the same branch. |