summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 06:09:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 06:09:13 +0000
commitcebee31a0483ef7f2cade3d6dde0a53a68e86cc6 (patch)
treeb818a3e84bde169e6b2a9c96d9b794b6b8708094 /doc
parent7ec2694360b4d4bd9a4b00ef5166a77c854d9d4f (diff)
downloadgitlab-ce-cebee31a0483ef7f2cade3d6dde0a53a68e86cc6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/api/group_boards.md25
-rw-r--r--doc/integration/img/jira_dev_panel_jira_setup_1-1.pngbin0 -> 45848 bytes
-rw-r--r--doc/integration/jira_development_panel.md5
3 files changed, 19 insertions, 11 deletions
diff --git a/doc/api/group_boards.md b/doc/api/group_boards.md
index f4d45f8f402..dfa430cca8b 100644
--- a/doc/api/group_boards.md
+++ b/doc/api/group_boards.md
@@ -484,20 +484,29 @@ POST /groups/:id/boards/:board_id/lists
| `label_id` | integer | yes | The ID of a label |
```shell
-curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/groups/5/boards/1/lists?label_id=5
+curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/groups/4/boards/12/lists?milestone_id=7
```
Example response:
```json
{
- "id" : 1,
- "label" : {
- "name" : "Testing",
- "color" : "#F0AD4E",
- "description" : null
- },
- "position" : 1
+ "id": 9,
+ "label": null,
+ "position": 0,
+ "milestone": {
+ "id": 7,
+ "iid": 3,
+ "group_id": 12,
+ "title": "Milestone with due date",
+ "description": "",
+ "state": "active",
+ "created_at": "2017-09-03T07:16:28.596Z",
+ "updated_at": "2017-09-03T07:16:49.521Z",
+ "due_date": null,
+ "start_date": null,
+ "web_url": "https://gitlab.example.com/groups/issue-reproduce/-/milestones/3"
+ }
}
```
diff --git a/doc/integration/img/jira_dev_panel_jira_setup_1-1.png b/doc/integration/img/jira_dev_panel_jira_setup_1-1.png
new file mode 100644
index 00000000000..e3c6c01c153
--- /dev/null
+++ b/doc/integration/img/jira_dev_panel_jira_setup_1-1.png
Binary files differ
diff --git a/doc/integration/jira_development_panel.md b/doc/integration/jira_development_panel.md
index 02cfdc32abb..05a83e0987a 100644
--- a/doc/integration/jira_development_panel.md
+++ b/doc/integration/jira_development_panel.md
@@ -65,11 +65,10 @@ There are no special requirements if you are using GitLab.com.
## Jira Configuration
-1. In Jira, from the gear menu at the top right, go to `Applications`. Navigate to `DVCS accounts`
- from the left navigation menu. Click `Link GitHub account` to start creating a new integration.
+1. In Jira, go to **Jira Settings > Applications > DVCS accounts**, then click **Link GitHub Enterprise account** to start creating a new integration.
(We are pretending to be GitHub in this integration until there is further platform support from Jira.)
- ![Jira DVCS from Dashboard](img/jira_dev_panel_jira_setup_1.png)
+ ![Jira Settings](img/jira_dev_panel_jira_setup_1-1.png)
1. Complete the form