Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 21 deletions

diff --git a/spec/views/admin/application_settings/_repository_check.html.haml_spec.rb b/spec/views/admin/application_settings/_repository_check.html.haml_spec.rb
index dc3459f84ef..011f05eac21 100644
--- a/spec/views/admin/application_settings/_repository_check.html.haml_spec.rb
+++ b/spec/views/admin/application_settings/_repository_check.html.haml_spec.rb
@@ -41,27 +41,6 @@ RSpec.describe 'admin/application_settings/_repository_check.html.haml', feature
 
       expect(rendered).to have_field('Enable automatic repository housekeeping')
       expect(rendered).to have_field('Optimize repository period')
-
-      # TODO: Remove it along with optimized_housekeeping feature flag
-      expect(rendered).not_to have_field('Incremental repack period')
-      expect(rendered).not_to have_field('Full repack period')
-      expect(rendered).not_to have_field('Git GC period')
-    end
-
-    context 'when optimized_housekeeping is disabled' do
-      before do
-        stub_feature_flags(optimized_housekeeping: false)
-      end
-
-      it 'renders the correct setting subsection content' do
-        render
-
-        expect(rendered).to have_field('Enable automatic repository housekeeping')
-        expect(rendered).to have_field('Incremental repack period')
-        expect(rendered).to have_field('Full repack period')
-        expect(rendered).to have_field('Git GC period')
-        expect(rendered).not_to have_field('Optimize repository period')
-      end
     end
   end