From 064a2c2763a567babbe1eac8f7749742fd757508 Mon Sep 17 00:00:00 2001 From: Dzmitry Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com> Date: Thu, 25 May 2023 12:41:46 +0200 Subject: [PATCH 1/3] Remove the feature flag npm_group_level_endpoints This commit removes the feature flag and makes npm group level endpoints available. Changelog: changed --- .../development/npm_group_level_endpoints.yml | 8 -------- doc/api/packages/npm.md | 6 +----- doc/user/packages/npm_registry/index.md | 6 +----- lib/api/npm_group_packages.rb | 4 ---- 4 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 config/feature_flags/development/npm_group_level_endpoints.yml diff --git a/config/feature_flags/development/npm_group_level_endpoints.yml b/config/feature_flags/development/npm_group_level_endpoints.yml deleted file mode 100644 index 13ebade2cecfa4..00000000000000 --- a/config/feature_flags/development/npm_group_level_endpoints.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: npm_group_level_endpoints -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119073 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409476 -milestone: '16.0' -type: development -group: group::package registry -default_enabled: false diff --git a/doc/api/packages/npm.md b/doc/api/packages/npm.md index 664737e317a3e1..e046124d3004ca 100644 --- a/doc/api/packages/npm.md +++ b/doc/api/packages/npm.md @@ -150,11 +150,7 @@ The examples in this document all use the project-level prefix. ### Group-level -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.0 [with a flag](../../administration/feature_flags.md) named `npm_group_level_endpoints`. Disabled by default. - -FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `npm_group_level_endpoints`. -The feature is not ready for production use. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.1. ```plaintext /groups/:id/-/packages/npm` diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md index 33ae73dddc27f9..fcd4cf496ce970 100644 --- a/doc/user/packages/npm_registry/index.md +++ b/doc/user/packages/npm_registry/index.md @@ -195,11 +195,7 @@ To install a package from the instance level, the package must have been publish ### Install from the group level -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.0 [with a flag](../../../administration/feature_flags.md) named `npm_group_level_endpoints`. Disabled by default. - -FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named `npm_group_level_endpoints`. -The feature is not ready for production use. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.1. 1. [Authenticate to the Package Registry](#authenticate-to-the-package-registry). diff --git a/lib/api/npm_group_packages.rb b/lib/api/npm_group_packages.rb index 3a121677bcb7d2..1aa3135b186e37 100644 --- a/lib/api/npm_group_packages.rb +++ b/lib/api/npm_group_packages.rb @@ -13,10 +13,6 @@ def endpoint_scope end end - after_validation do - not_found! unless Feature.enabled?(:npm_group_level_endpoints, group) - end - params do requires :id, types: [String, Integer], desc: 'The ID or URL-encoded path of the group' end -- GitLab From 73461a845d8f699f0fedbaf0eabb5ce22c328c60 Mon Sep 17 00:00:00 2001 From: Dzmitry Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com> Date: Tue, 30 May 2023 09:13:59 +0200 Subject: [PATCH 2/3] Keep version history in the documentation --- doc/api/packages/npm.md | 7 ++++++- doc/user/packages/npm_registry/index.md | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/api/packages/npm.md b/doc/api/packages/npm.md index e046124d3004ca..738827d7ead049 100644 --- a/doc/api/packages/npm.md +++ b/doc/api/packages/npm.md @@ -150,7 +150,12 @@ The examples in this document all use the project-level prefix. ### Group-level -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.1. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.0. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121837) in GitLab 16.1. Feature flag `npm_group_level_endpoints` removed. + +FLAG: +On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `npm_group_level_endpoints`. +The feature is not ready for production use. ```plaintext /groups/:id/-/packages/npm` diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md index fcd4cf496ce970..188ed9ffe31411 100644 --- a/doc/user/packages/npm_registry/index.md +++ b/doc/user/packages/npm_registry/index.md @@ -195,7 +195,12 @@ To install a package from the instance level, the package must have been publish ### Install from the group level -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.1. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.0. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121837) in GitLab 16.1. Feature flag `npm_group_level_endpoints` removed. + +FLAG: +On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named `npm_group_level_endpoints`. +The feature is not ready for production use. 1. [Authenticate to the Package Registry](#authenticate-to-the-package-registry). -- GitLab From 8a37c074177d81dee95ea612eee2eea0afbfbabf Mon Sep 17 00:00:00 2001 From: Dzmitry Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com> Date: Tue, 30 May 2023 09:51:31 +0200 Subject: [PATCH 3/3] Update the documenation --- doc/api/packages/npm.md | 6 +----- doc/user/packages/npm_registry/index.md | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/doc/api/packages/npm.md b/doc/api/packages/npm.md index 738827d7ead049..6f4d8446dbfc18 100644 --- a/doc/api/packages/npm.md +++ b/doc/api/packages/npm.md @@ -150,13 +150,9 @@ The examples in this document all use the project-level prefix. ### Group-level -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.0. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.0 [with a flag](../../administration/feature_flags.md) named `npm_group_level_endpoints`. Disabled by default. > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121837) in GitLab 16.1. Feature flag `npm_group_level_endpoints` removed. -FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `npm_group_level_endpoints`. -The feature is not ready for production use. - ```plaintext /groups/:id/-/packages/npm` ``` diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md index 188ed9ffe31411..0fe2b39a5911cb 100644 --- a/doc/user/packages/npm_registry/index.md +++ b/doc/user/packages/npm_registry/index.md @@ -195,13 +195,9 @@ To install a package from the instance level, the package must have been publish ### Install from the group level -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.0. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299834) in GitLab 16.0 [with a flag](../../../administration/feature_flags.md) named `npm_group_level_endpoints`. Disabled by default. > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121837) in GitLab 16.1. Feature flag `npm_group_level_endpoints` removed. -FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named `npm_group_level_endpoints`. -The feature is not ready for production use. - 1. [Authenticate to the Package Registry](#authenticate-to-the-package-registry). 1. Set the registry -- GitLab