diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-06-20 19:49:56 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-06-20 19:49:56 +0300 |
| commit | ab561b3e049a9270a1cca91cd3275e56a0166e2a (patch) | |
| tree | 41315e79cdc71d7306ed72814c794cf0f841dfc2 | |
| parent | 867590945742ec0325b4e27d6523e004695e1405 (diff) | |
| parent | 3b1ffeb812161d362a06270ad6f9786c43c649f2 (diff) | |
Merge branch '12-0-stable-prepare-rc22' into '12-0-stable'
Prepare 12.0.0-rc22 release
See merge request gitlab-org/gitlab-ce!29901
| -rw-r--r-- | doc/user/project/clusters/serverless/index.md | 18 | ||||
| -rw-r--r-- | doc/user/project/issues/issue_data_and_actions.md | 11 |
2 files changed, 23 insertions, 6 deletions
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md index 0ab6d8e112f..3be5bfeaddc 100644 --- a/doc/user/project/clusters/serverless/index.md +++ b/doc/user/project/clusters/serverless/index.md @@ -85,12 +85,22 @@ on a given project but not both. The current implementation makes use of a `serv ## Using an existing installation of Knative +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/58941) in GitLab 12.0. + NOTE: **Note:** -The "invocations" monitoring feature of GitLab serverless will not work when adding an existing installation of Knative. +The "invocations" monitoring feature of GitLab serverless will not work when +adding an existing installation of Knative. + +It is also possible to use GitLab Serverless with an existing Kubernetes +cluster which already has Knative installed. + +Simply: -It is also possible to use GitLab Serverless with an existing Kubernetes cluster which already has Knative installed. -Simply follow the steps to [add an existing Kubernetes cluster](../index.md#adding-an-existing-kubernetes-cluster) -and then follow the steps to deploy [functions](#deploying-functions) or [serverless applications](#deploying-serverless-applications) onto your cluster. +1. Follow the steps to + [add an existing Kubernetes cluster](../index.md#adding-an-existing-kubernetes-cluster). +1. Follow the steps to deploy [functions](#deploying-functions) + or [serverless applications](#deploying-serverless-applications) onto your + cluster. ## Deploying functions 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:  +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 |