summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-06-19 07:46:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-06-19 07:46:23 +0000
commit3e65d9fc43dc0854cf936e40b932a33207465410 (patch)
tree5214c6ed2e96964bdc4a6328c0585354c7252966
parent66464f662b49040e1246713cf56cd1fa8fe63783 (diff)
parent366d0eb2018c652eb03e48f6b921e705d1789455 (diff)
downloadgitlab-ce-3e65d9fc43dc0854cf936e40b932a33207465410.tar.gz
Automatic merge of gitlab-org/gitlab-ce master
-rw-r--r--doc/user/project/issues/img/link_zoom_call_in_issue.pngbin0 -> 69554 bytes
-rw-r--r--doc/user/project/issues/issue_data_and_actions.md6
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/user/project/issues/img/link_zoom_call_in_issue.png b/doc/user/project/issues/img/link_zoom_call_in_issue.png
new file mode 100644
index 00000000000..3153a0a9b07
--- /dev/null
+++ b/doc/user/project/issues/img/link_zoom_call_in_issue.png
Binary files differ
diff --git a/doc/user/project/issues/issue_data_and_actions.md b/doc/user/project/issues/issue_data_and_actions.md
index da585022263..ac26b672d99 100644
--- a/doc/user/project/issues/issue_data_and_actions.md
+++ b/doc/user/project/issues/issue_data_and_actions.md
@@ -149,6 +149,12 @@ 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
+
+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.
+
+![Link Zoom Call in Issue](img/link_zoom_call_in_issue.png)
+
#### 17. Mentions
You can mention a user or a group present in your GitLab instance with `@username` or