Commit bbf52b48 authored by Michael Kozono's avatar Michael Kozono

Merge branch 'clean_geo_upload_verification_feature_flag' into 'master'

Geo: Verify Uploads (FF removal)

See merge request gitlab-org/gitlab!78068
parents 2f5eb166 ddf052cf
......@@ -188,7 +188,7 @@ successfully, you must replicate their data using some other means.
|[Project repository](../../../user/project/repository/) | **Yes** (10.2) | **Yes** (10.7) | No | |
|[Project wiki repository](../../../user/project/wiki/) | **Yes** (10.2) | **Yes** (10.7) | No | |
|[Group wiki repository](../../../user/project/wiki/group.md) | [**Yes** (13.10)](https://gitlab.com/gitlab-org/gitlab/-/issues/208147) | No | No | Behind feature flag `geo_group_wiki_repository_replication`, enabled by default. |
|[Uploads](../../uploads.md) | **Yes** (10.2) | **Yes** (14.6) | Via Object Storage provider if supported. Native Geo support (Beta). | Replication is behind the feature flag `geo_upload_replication`, enabled by default. Verification is behind the feature flag `geo_upload_verification` introduced and enabled by default in 14.6. |
|[Uploads](../../uploads.md) | **Yes** (10.2) | **Yes** (14.6) | Via Object Storage provider if supported. Native Geo support (Beta). | Replication is behind the feature flag `geo_upload_replication`, enabled by default. Verification was behind the feature flag `geo_upload_verification`, removed in 14.8. |
|[LFS objects](../../lfs/index.md) | **Yes** (10.2) | **Yes** (14.6) | Via Object Storage provider if supported. Native Geo support (Beta). | GitLab versions 11.11.x and 12.0.x are affected by [a bug that prevents any new LFS objects from replicating](https://gitlab.com/gitlab-org/gitlab/-/issues/32696).<br /><br />Replication is behind the feature flag `geo_lfs_object_replication`, enabled by default. Verification was behind the feature flag `geo_lfs_object_verification`, removed in 14.7. |
|[Personal snippets](../../../user/snippets.md) | **Yes** (10.2) | **Yes** (10.2) | No | |
|[Project snippets](../../../user/snippets.md) | **Yes** (10.2) | **Yes** (10.2) | No | |
......
......@@ -36,7 +36,7 @@ module Geo
override :verification_feature_flag_enabled?
def self.verification_feature_flag_enabled?
Feature.enabled?(:geo_upload_verification, default_enabled: :yaml)
true
end
def carrierwave_uploader
......
---
name: geo_upload_verification
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65921
rollout_issue_url:
milestone: '14.6'
type: development
group: group::geo
default_enabled: true
......@@ -9,7 +9,6 @@ RSpec.describe Geo::FileUploadService do
before do
stub_current_geo_node(node)
stub_feature_flags(geo_upload_verification: false)
end
describe '#retriever' do
......
......@@ -14,7 +14,6 @@ RSpec.describe Projects::CleanupService do
describe '#execute' do
before do
stub_current_geo_node(primary)
stub_feature_flags(geo_upload_verification: false)
end
it 'sends a Geo notification about the update on success' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment