From 5247fe0bef72fa922841a79d5dbefb47d95112fa Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Feb 2020 06:09:13 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/groups/settings/_permanent_deletion.html.haml | 2 +- doc/api/packages.md | 4 ++++ locale/gitlab.pot | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/views/groups/settings/_permanent_deletion.html.haml b/app/views/groups/settings/_permanent_deletion.html.haml index 31e2bac70be..155efc03ffe 100644 --- a/app/views/groups/settings/_permanent_deletion.html.haml +++ b/app/views/groups/settings/_permanent_deletion.html.haml @@ -2,7 +2,7 @@ %h4.danger-title= _('Remove group') = form_tag(group, method: :delete) do %p - = _('Removing group will cause all child projects and resources to be removed.') + = _('Removing this group also removes all child projects, including archived projects, and their resources.') %br %strong= _('Removed group can not be restored!') diff --git a/doc/api/packages.md b/doc/api/packages.md index 1d39e19bbf3..5e993dbf5f5 100644 --- a/doc/api/packages.md +++ b/doc/api/packages.md @@ -18,6 +18,8 @@ GET /projects/:id/packages | Attribute | Type | Required | Description | | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) | +| `order_by`| string | no | The field to use as order. One of `created_at` (default), `name`, `version`, or `type`. | +| `sort` | string | no | The direction of the order, either `asc` (default) for ascending order or `desc` for descending order. | ```shell curl --header "PRIVATE-TOKEN: " https://gitlab.example.com/api/v4/projects/:id/packages @@ -61,6 +63,8 @@ GET /groups/:id/packages | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | ID or [URL-encoded path of the group](README.md#namespaced-path-encoding). | | `exclude_subgroups` | boolean | false | If the param is included as true, packages from projects from subgroups are not listed. Default is `false`. | +| `order_by`| string | no | The field to use as order. One of `created_at` (default), `name`, `version`, `type`, or `project_path`. | +| `sort` | string | no | The direction of the order, either `asc` (default) for ascending order or `desc` for descending order. | ```shell curl --header "PRIVATE-TOKEN: " https://gitlab.example.com/api/v4/groups/:id/packages?exclude_subgroups=true diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 5cf809401ea..c369fbda9d2 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -16058,15 +16058,15 @@ msgstr "" msgid "Removing a project places it into a read-only state until %{date}, at which point the project will be permanently removed." msgstr "" -msgid "Removing group will cause all child projects and resources to be removed." -msgstr "" - msgid "Removing license…" msgstr "" msgid "Removing the project will delete its repository and all related resources including issues, merge requests etc." msgstr "" +msgid "Removing this group also removes all child projects, including archived projects, and their resources." +msgstr "" + msgid "Rename file" msgstr "" -- cgit v1.2.3