summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-06-12 19:28:19 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-06-12 19:28:19 +0000
commitb05de5a583e35931967dcc70d2f26f568c9cf0db (patch)
tree1d24a950292ec0fa14f598e7c19d7ef798fb9bbc
parentc5902f159533ccd6ee9102982f8cd8a150461bd1 (diff)
parent0a2a668654b57ea8311313957c3f476a57219cfd (diff)
downloadgitlab-ce-b05de5a583e35931967dcc70d2f26f568c9cf0db.tar.gz
Merge branch 'docs/add-selected-youtube-videos' into 'master'
Add links to select YouTube videos demonstrating GitLab features to docs See merge request gitlab-org/gitlab-ce!29562
-rw-r--r--doc/user/discussions/index.md2
-rw-r--r--doc/user/project/labels.md2
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 5d69efc3600..20eabdada79 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -53,6 +53,8 @@ persist through a commit ID change when:
- force-pushing after a rebase
- amending a commit
+This functionality is also demonstrated in the video [How to use Merge Request Commit Discussions](https://www.youtube.com/watch?v=TviJH6oRboo).
+
To create a commit diff discussion:
1. Navigate to the merge request **Commits** tab. A list of commits that
diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md
index e5f62a3bb8d..71a595e49b0 100644
--- a/doc/user/project/labels.md
+++ b/doc/user/project/labels.md
@@ -32,6 +32,8 @@ An issue, epic, or merge request cannot have two scoped labels with the same key
For example, if an issue is already labeled `priority::3` and you apply the label `priority::2` to it,
`priority::3` is automatically removed.
+This functionality is demonstrated in a video titled [Use scoped labels in GitLab 11.10 for custom fields and custom workflows](https://www.youtube.com/watch?v=4BCBby6du3c).
+
### Labels with multiple colon pairs
If labels have multiple instances of `::`, the longest path from left to right, until the last `::`, is considered the "key" or the "scope".