Merge branch '6964-geo-unable-to-disable-verification-on-the-secondary' into 'master'

Resolve "Geo: Unable to disable verification on the secondary"

Closes #6964

See merge request gitlab-org/gitlab-ee!6599

ee/changelogs/unreleased/6964-geo-unable-to-disable-verification-on-the-secondary.yml

+---
+title: Geo - Allow repository verification to be disabled on a secondary node
+merge_request: 6599
+author:
+type: fixed

ee/lib/gitlab/geo.rb

@@ -111,7 +111,7 @@ module Gitlab
     end
 
     def self.repository_verification_enabled?
-      feature = Feature.get(:geo_repository_verification)
+      feature = Feature.get('geo_repository_verification')
 
       # If the feature has been set, always evaluate
       if Feature.persisted?(feature)

ee/spec/lib/gitlab/geo_spec.rb

@@ -182,22 +182,18 @@ describe Gitlab::Geo, :geo do
       end
     end
 
-    context "when the feature flag has been set" do
-      before do
-        allow(Feature).to receive(:persisted?).and_return(true)
-      end
-
-      context "when the feature flag is set to enabled" do
+    context 'when the feature flag has been set' do
+      context 'when the feature flag is set to enabled' do
         it 'returns true' do
-          Feature.enable(:geo_repository_verification)
+          Feature.enable('geo_repository_verification')
 
           expect(described_class.repository_verification_enabled?).to eq true
         end
       end
 
-      context "when the feature flag is set to disabled" do
+      context 'when the feature flag is set to disabled' do
         it 'returns false' do
-          Feature.disable(:geo_repository_verification)
+          Feature.disable('geo_repository_verification')
 
           expect(described_class.repository_verification_enabled?).to eq false
         end