summaryrefslogtreecommitdiff
path: root/doc/user/project/quick_actions.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-30 12:06:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-30 12:06:01 +0000
commitdea6ebd31af8e97e8b14160181bd4ea7578c94e8 (patch)
tree5e429fda4d43aa3450f7d6b015668c3474cd9e6c /doc/user/project/quick_actions.md
parent94611567bd03083e0ecef7a582a174aa34844482 (diff)
downloadgitlab-ce-dea6ebd31af8e97e8b14160181bd4ea7578c94e8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/quick_actions.md')
-rw-r--r--doc/user/project/quick_actions.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index bc16ea52578..d54ee6dcb07 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -64,8 +64,8 @@ The following quick actions are applicable to descriptions, discussions and thre
| `/create_merge_request <branch name>` | ✓ | | | Create a new merge request starting from the current issue |
| `/relate #issue1 #issue2` | ✓ | | | Mark issues as related **(STARTER)** |
| `/move <path/to/project>` | ✓ | | | Move this issue to another project |
-| `/zoom <Zoom URL>` | ✓ | | | Add Zoom meeting to this issue. ([Introduced in GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/merge_requests/16609). Must be enabled by feature flag `issue_zoom_integration` for self-hosted. [Feature flag to be removed and available by default in 12.4.](https://gitlab.com/gitlab-org/gitlab/issues/32133)) |
-| `/remove_zoom` | ✓ | | | Remove Zoom meeting from this issue. ([Introduced in GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/merge_requests/16609). Must be enabled by feature flag `issue_zoom_integration` for self-hosted. [Feature flag to be removed and available by default in 12.4.](https://gitlab.com/gitlab-org/gitlab/issues/32133)) |
+| `/zoom <Zoom URL>` | ✓ | | | Add Zoom meeting to this issue. |
+| `/remove_zoom` | ✓ | | | Remove Zoom meeting from this issue. |
| `/target_branch <local branch name>` | | ✓ | | Set target branch |
| `/wip` | | ✓ | | Toggle the Work In Progress status |
| `/approve` | | ✓ | | Approve the merge request |