Remove the keep_divergent_refs feature flag

This feature is now generally available.

app/views/projects/mirrors/_mirror_repos_push.html.haml

 - protocols = Gitlab::UrlSanitizer::ALLOWED_SCHEMES.join('|')
-- keep_divergent_refs = Feature.enabled?(:keep_divergent_refs, @project)
 
 = f.fields_for :remote_mirrors, @project.remote_mirrors.build do |rm_f|
   = rm_f.hidden_field :enabled, value: '1'
   = rm_f.hidden_field :url, class: 'js-mirror-url-hidden', required: true, pattern: "(#{protocols}):\/\/.+"
   = rm_f.hidden_field :only_protected_branches, class: 'js-mirror-protected-hidden'
-  - if keep_divergent_refs
-    = rm_f.hidden_field :keep_divergent_refs, class: 'js-mirror-keep-divergent-refs-hidden'
+  = rm_f.hidden_field :keep_divergent_refs, class: 'js-mirror-keep-divergent-refs-hidden'
   = render partial: 'projects/mirrors/ssh_host_keys', locals: { f: rm_f }
   = render partial: 'projects/mirrors/authentication_method', locals: { f: rm_f }
-  - if keep_divergent_refs
-    .form-check.append-bottom-10
-      = check_box_tag :keep_divergent_refs, '1', false, class: 'js-mirror-keep-divergent-refs form-check-input'
-      = label_tag :keep_divergent_refs, 'Keep divergent refs', class: 'form-check-label'
+  .form-check.append-bottom-10
+    = check_box_tag :keep_divergent_refs, '1', false, class: 'js-mirror-keep-divergent-refs form-check-input'
+    = label_tag :keep_divergent_refs, 'Keep divergent refs', class: 'form-check-label'

changelogs/unreleased/rs-enable-keep-divergent-refs.yml

+---
+title: Add "Keep divergent refs" option for push mirrors
+merge_request: 32381
+author:
+type: added

lib/api/entities/remote_mirror.rb

@@ -12,9 +12,7 @@ module API
       expose :last_successful_update_at
       expose :last_error
       expose :only_protected_branches
-      expose :keep_divergent_refs, if: -> (mirror, _options) do
-        ::Feature.enabled?(:keep_divergent_refs, mirror.project)
-      end
+      expose :keep_divergent_refs
     end
   end
 end

lib/api/remote_mirrors.rb

@@ -34,7 +34,6 @@ module API
       end
       post ':id/remote_mirrors' do
         create_params = declared_params(include_missing: false)
-        create_params.delete(:keep_divergent_refs) unless ::Feature.enabled?(:keep_divergent_refs, user_project)
 
         new_mirror = user_project.remote_mirrors.create(create_params)
 
@@ -59,7 +58,6 @@ module API
 
         mirror_params = declared_params(include_missing: false)
         mirror_params[:id] = mirror_params.delete(:mirror_id)
-        mirror_params.delete(:keep_divergent_refs) unless ::Feature.enabled?(:keep_divergent_refs, user_project)
 
         update_params = { remote_mirrors_attributes: mirror_params }
 

spec/features/projects/settings/repository_settings_spec.rb

@@ -222,20 +222,6 @@ describe 'Projects > Settings > Repository settings' do
       end
     end
 
-    # Removal: https://gitlab.com/gitlab-org/gitlab/-/issues/208828
-    context 'with the `keep_divergent_refs` feature flag disabled' do
-      before do
-        stub_feature_flags(keep_divergent_refs: false)
-      end
-
-      it 'hides the "Keep divergent refs" option' do
-        visit project_settings_repository_path(project)
-
-        expect(page).not_to have_selector('#keep_divergent_refs')
-        expect(page).not_to have_text('Keep divergent refs')
-      end
-    end
-
     context 'repository cleanup settings' do
       let(:object_map_file) { Rails.root.join('spec', 'fixtures', 'bfg_object_map.txt') }
 

spec/requests/api/remote_mirrors_spec.rb

@@ -78,10 +78,6 @@ describe API::RemoteMirrors do
     let(:route) { ->(id) { "/projects/#{project.id}/remote_mirrors/#{id}" } }
     let(:mirror) { project.remote_mirrors.first }
 
-    before do
-      stub_feature_flags(keep_divergent_refs: false)
-    end
-
     it 'requires `admin_remote_mirror` permission' do
       put api(route[mirror.id], developer)
 
@@ -100,24 +96,7 @@ describe API::RemoteMirrors do
       expect(response).to have_gitlab_http_status(:success)
       expect(json_response['enabled']).to eq(false)
       expect(json_response['only_protected_branches']).to eq(true)
-
-      # Deleted due to lack of feature availability
-      expect(json_response['keep_divergent_refs']).to be_nil
-    end
-
-    context 'with the `keep_divergent_refs` feature enabled' do
-      before do
-        stub_feature_flags(keep_divergent_refs: project)
-      end
-
-      it 'updates the `keep_divergent_refs` attribute' do
-        project.add_maintainer(user)
-
-        put api(route[mirror.id], user), params: { keep_divergent_refs: 'true' }
-
-        expect(response).to have_gitlab_http_status(:success)
-        expect(json_response['keep_divergent_refs']).to eq(true)
-      end
+      expect(json_response['keep_divergent_refs']).to eq(true)
     end
   end
 end