diff --git a/app/models/project.rb b/app/models/project.rb index f8924e3c51e744ef5dbcb5f749075cf737e4d8cd..c255ccfc7fa9a10f624809a2ce6dc3abc29794a2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1962,11 +1962,8 @@ def track_project_repository (project_repository || build_project_repository).tap do |proj_repo| attributes = { shard_name: repository_storage, disk_path: disk_path } - if Feature.enabled?(:store_object_format, namespace, type: :gitlab_com_derisk) - object_format = repository.object_format - - attributes[:object_format] = object_format if object_format.present? - end + object_format = repository.object_format + attributes[:object_format] = object_format if object_format.present? proj_repo.update!(**attributes) end diff --git a/config/feature_flags/gitlab_com_derisk/store_object_format.yml b/config/feature_flags/gitlab_com_derisk/store_object_format.yml deleted file mode 100644 index df43ef519a06ebb25b289d6b36de0ce397adc3b2..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/store_object_format.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: store_object_format -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419887 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139108 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434364 -milestone: '16.9' -type: gitlab_com_derisk -group: group::source code -default_enabled: false diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 1a7f2e6614b1a8260bee91d1f0236b09f4c936a7..936303d0be60e46186948cc951695337be1f25ce 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -3130,22 +3130,6 @@ def has_external_wiki object_format: 'sha256' ) end - - context 'when feature flag "store_object_format" is disabled' do - before do - stub_feature_flags(store_object_format: false) - end - - it 'tracks a SHA1 object format' do - project.track_project_repository - - expect(project.project_repository).to have_attributes( - disk_path: project.disk_path, - shard_name: project.repository_storage, - object_format: 'sha1' - ) - end - end end end