diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb index c0570776f657c8ac164d0628c825c6ab9e0dafd2..ff10583239189b79c5193109682261dfc4105254 100644 --- a/app/models/container_repository.rb +++ b/app/models/container_repository.rb @@ -439,9 +439,7 @@ def location end def tag(tag) - if migrated? && - Feature.enabled?(:fetch_tag_info_from_registry, project, type: :gitlab_com_derisk) && - ContainerRegistry::GitlabApiClient.supports_gitlab_api? + if migrated? && ContainerRegistry::GitlabApiClient.supports_gitlab_api? page = tags_page(name: tag, page_size: 1) page[:tags].first diff --git a/config/feature_flags/gitlab_com_derisk/fetch_tag_info_from_registry.yml b/config/feature_flags/gitlab_com_derisk/fetch_tag_info_from_registry.yml deleted file mode 100644 index 42d909ea804a84766a6ab3f4ac99b8d4bb98ff6f..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/fetch_tag_info_from_registry.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: fetch_tag_info_from_registry -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432472 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141838 -rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17395 -milestone: '16.9' -group: group::container registry -type: gitlab_com_derisk -default_enabled: false diff --git a/spec/models/container_repository_spec.rb b/spec/models/container_repository_spec.rb index ade44612e15af8548cfa29f2a05002a6232908fc..ec9f4c787a4f155857eb4cda94834ef1e307089d 100644 --- a/spec/models/container_repository_spec.rb +++ b/spec/models/container_repository_spec.rb @@ -553,14 +553,6 @@ it_behaves_like 'returning an instantiated tag' end - - context 'when the feature fetch_tag_info_from_registry is disabled' do - before do - stub_feature_flags(fetch_tag_info_from_registry: false) - end - - it_behaves_like 'returning an instantiated tag' - end end context 'when the repository is not migrated' do diff --git a/spec/requests/api/project_container_repositories_spec.rb b/spec/requests/api/project_container_repositories_spec.rb index 50c639b2ed7db9ccd4838a38287381a42487f847..cc3a4dc67791d9943f86cccf14f2d3f660b80342 100644 --- a/spec/requests/api/project_container_repositories_spec.rb +++ b/spec/requests/api/project_container_repositories_spec.rb @@ -433,15 +433,6 @@ it_behaves_like 'returning the tag' end - - context 'when the feature fetch_tag_info_from_registry is disabled' do - before do - stub_feature_flags(fetch_tag_info_from_registry: false) - stub_container_registry_tags(repository: root_repository.path, tags: %w[rootA], with_manifest: true) - end - - it_behaves_like 'returning the tag' - end end end end