From e66d6781ef36e39d15b1b9bc84cc30e87969edad Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 26 Sep 2019 18:06:29 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/api/group_labels.md | 1 + doc/api/labels.md | 1 + doc/user/project/import/bitbucket.md | 6 +++--- .../import/img/bitbucket_import_select_project.png | Bin 8688 -> 0 bytes .../img/bitbucket_import_select_project_v12_3.png | Bin 0 -> 112397 bytes 5 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 doc/user/project/import/img/bitbucket_import_select_project.png create mode 100644 doc/user/project/import/img/bitbucket_import_select_project_v12_3.png (limited to 'doc') diff --git a/doc/api/group_labels.md b/doc/api/group_labels.md index 5030bba3159..9563f967a2a 100644 --- a/doc/api/group_labels.md +++ b/doc/api/group_labels.md @@ -16,6 +16,7 @@ GET /groups/:id/labels | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user. | | `with_counts` | boolean | no | Whether or not to include issue and merge request counts. Defaults to `false`. _([Introduced in GitLab 12.2](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31543))_ | +| `include_ancestor_groups` | boolean | no | Include ancestor groups. Defaults to `true`. | ```bash curl --header "PRIVATE-TOKEN: " https://gitlab.example.com/api/v4/groups/5/labels?with_counts=true diff --git a/doc/api/labels.md b/doc/api/labels.md index 93833fd81cb..f29c0a28cdf 100644 --- a/doc/api/labels.md +++ b/doc/api/labels.md @@ -12,6 +12,7 @@ GET /projects/:id/labels | --------- | ------- | -------- | --------------------- | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `with_counts` | boolean | no | Whether or not to include issue and merge request counts. Defaults to `false`. _([Introduced in GitLab 12.2](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31543))_ | +| `include_ancestor_groups` | boolean | no | Include ancestor groups. Defaults to `true`. | ```bash curl --header "PRIVATE-TOKEN: " https://gitlab.example.com/api/v4/projects/1/labels?with_counts=true diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md index e509e333313..77fc2761e07 100644 --- a/doc/user/project/import/bitbucket.md +++ b/doc/user/project/import/bitbucket.md @@ -56,10 +56,10 @@ namespace that started the import process. ![Grant access](img/bitbucket_import_grant_access.png) 1. Click on the projects that you'd like to import or **Import all projects**. - You can also select the namespace under which each project will be - imported. + You can also filter projects by name and select the namespace under which + each project will be imported. - ![Import projects](img/bitbucket_import_select_project.png) + ![Import projects](img/bitbucket_import_select_project_v12_3.png) [bb-import]: ../../../integration/bitbucket.md [social sign-in]: ../../profile/account/social_sign_in.md diff --git a/doc/user/project/import/img/bitbucket_import_select_project.png b/doc/user/project/import/img/bitbucket_import_select_project.png deleted file mode 100644 index 1bca6166ec8..00000000000 Binary files a/doc/user/project/import/img/bitbucket_import_select_project.png and /dev/null differ diff --git a/doc/user/project/import/img/bitbucket_import_select_project_v12_3.png b/doc/user/project/import/img/bitbucket_import_select_project_v12_3.png new file mode 100644 index 00000000000..1f1febd9068 Binary files /dev/null and b/doc/user/project/import/img/bitbucket_import_select_project_v12_3.png differ -- cgit v1.2.3