summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-06-20 09:15:40 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-06-20 09:15:40 +0000
commit265fc7bc336f061570bab5bd7483b2f86b12ce7f (patch)
tree1f1484f3283bc4ef64b9dfd123f65885c869b991
parent49b524710e8b5bdb8046e29ed848cab0da02a24d (diff)
parentf26185a01ba0f85019826de174ac794f46568c9b (diff)
downloadgitlab-ce-265fc7bc336f061570bab5bd7483b2f86b12ce7f.tar.gz
Merge branch 'docs/edit-zoom-call-link-content' into 'master'
Edit new Zoom call link content See merge request gitlab-org/gitlab-ce!29878
-rw-r--r--doc/user/project/issues/issue_data_and_actions.md11
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/user/project/issues/issue_data_and_actions.md b/doc/user/project/issues/issue_data_and_actions.md
index ac26b672d99..2103f331aa2 100644
--- a/doc/user/project/issues/issue_data_and_actions.md
+++ b/doc/user/project/issues/issue_data_and_actions.md
@@ -149,12 +149,19 @@ The plain text title and description of the issue fill the top center of the iss
The description fully supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm),
allowing many formatting options.
-##### 16.1 Zoom Call Links
+##### Zoom call links
-Including a link to a Zoom call in the description of an issue will result in a "Join Zoom meeting" button at the top of the issue, just under the header. To remove the button, edit the description and remove the Zoom call link.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/62966) in GitLab 12.0.
+
+Including a link to a [Zoom](https://zoom.us) call in the description of an issue
+results in a **Join Zoom meeting** button at the top of the issue, just under the header.
+
+For example:
![Link Zoom Call in Issue](img/link_zoom_call_in_issue.png)
+To remove the button, edit the description and remove the Zoom call link.
+
#### 17. Mentions
You can mention a user or a group present in your GitLab instance with `@username` or