diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 15:06:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 15:06:01 +0300 |
| commit | dea6ebd31af8e97e8b14160181bd4ea7578c94e8 (patch) | |
| tree | 5e429fda4d43aa3450f7d6b015668c3474cd9e6c /doc | |
| parent | 94611567bd03083e0ecef7a582a174aa34844482 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/epics.md | 8 | ||||
| -rw-r--r-- | doc/user/project/quick_actions.md | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/api/epics.md b/doc/api/epics.md index 92b534fc187..7ef12766f78 100644 --- a/doc/api/epics.md +++ b/doc/api/epics.md @@ -67,7 +67,7 @@ Example response: "title": "Accusamus iste et ullam ratione voluptatem omnis debitis dolor est.", "description": "Molestias dolorem eos vitae expedita impedit necessitatibus quo voluptatum.", "state": "opened", - "web_edit_url": "http://localhost:3001/groups/test/-/epics/4", + "web_url": "http://localhost:3001/groups/test/-/epics/4", "reference": "&4", "author": { "id": 10, @@ -122,7 +122,7 @@ Example response: "title": "Ea cupiditate dolores ut vero consequatur quasi veniam voluptatem et non.", "description": "Molestias dolorem eos vitae expedita impedit necessitatibus quo voluptatum.", "state": "opened", - "web_edit_url": "http://localhost:3001/groups/test/-/epics/5", + "web_url": "http://localhost:3001/groups/test/-/epics/5", "reference": "&5", "author":{ "id": 7, @@ -188,7 +188,7 @@ Example response: "title": "Epic", "description": "Epic description", "state": "opened", - "web_edit_url": "http://localhost:3001/groups/test/-/epics/6", + "web_url": "http://localhost:3001/groups/test/-/epics/5", "reference": "&6", "author": { "name" : "Alexandra Bashirian", @@ -255,7 +255,7 @@ Example response: "title": "New Title", "description": "Epic description", "state": "opened", - "web_edit_url": "http://localhost:3001/groups/test/-/epics/6", + "web_url": "http://localhost:3001/groups/test/-/epics/5", "reference": "&6", "author": { "name" : "Alexandra Bashirian", 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 | |