diff --git a/config/feature_flags/beta/single_relation_import.yml b/config/feature_flags/beta/single_relation_import.yml deleted file mode 100644 index 312b3026d9a15f4b5bb1429553add6dc20d47e00..0000000000000000000000000000000000000000 --- a/config/feature_flags/beta/single_relation_import.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: single_relation_import -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425798 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149444 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/455889 -milestone: '16.11' -group: group::import and integrate -type: beta -default_enabled: false diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md index 93def8c57fc08a8bbd8053ca48eb7ace4ea0231b..84d95da6e8b0f150316abef8ce2f7ab8a383416f 100644 --- a/doc/api/project_import_export.md +++ b/doc/api/project_import_export.md @@ -269,7 +269,7 @@ The `Content-Type` header must be `application/gzip`. ## Import a single relation > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/425798) in GitLab 16.11 in [beta](../policy/experiment-beta-support.md#beta)), [with a flag](../administration/feature_flags.md) named `single_relation_import`. Disabled by default. -> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/455889) in 17.1. +> - [Enabled on GitLab.com, self-managed and Dedicated](https://gitlab.com/gitlab-org/gitlab/-/issues/455889) in 17.1. This endpoint accepts a project export archive and a named relation (issues, merge requests, pipelines, or milestones) and re-imports that relation, skipping diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb index c7fd491d5b7463e5a24a584d35186141576f0e95..44f3e90d7044238d75009cc5d96ef24b29c06bed 100644 --- a/lib/api/project_import.rb +++ b/lib/api/project_import.rb @@ -239,7 +239,6 @@ def filtered_override_params(params) consumes ['multipart/form-data'] end post 'import-relation' do - not_found! unless Feature.enabled?(:single_relation_import, current_user, type: :beta) forbidden! unless Gitlab::CurrentSettings.import_sources.include?('gitlab_project') require_gitlab_workhorse! diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb index a86e77319d4163721a9dcd9233aae737551edf3b..1b0f654e7a82dac9d1c84ea7c79ab42b20369dd7 100644 --- a/spec/requests/api/project_import_spec.rb +++ b/spec/requests/api/project_import_spec.rb @@ -608,20 +608,6 @@ def stub_import(namespace) end end - context 'when the feature flag :single_relation_import is disabled' do - before do - stub_feature_flags(single_relation_import: false) - end - - it 'returns not found' do - params[:path] = 'any/project' - - perform_relation_import - - expect(response).to have_gitlab_http_status(:not_found) - end - end - def upload_relation_archive(file, headers = {}, params = {}) workhorse_finalize( api("/projects/import-relation", user),