1 files changed, 6 insertions, 24 deletions
diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml
index 332d3a94b92..b67cc29f296 100644
--- a/app/views/admin/application_settings/_repository_check.html.haml
+++ b/app/views/admin/application_settings/_repository_check.html.haml
@@ -19,33 +19,15 @@
       %h4= _("Housekeeping")
       .form-group
         - help_text = _("Run housekeeping tasks to automatically optimize Git repositories. Disabling this option will cause performance to degenerate over time.")
-        - help_link = link_to _('Learn more.'), help_page_path('administration/housekeeping.md', anchor: 'configure-push-based-maintenance'), target: '_blank', rel: 'noopener noreferrer'
+        - help_link = link_to _('Learn more.'), help_page_path('administration/housekeeping.md', anchor: 'heuristical-housekeeping'), target: '_blank', rel: 'noopener noreferrer'
         = f.gitlab_ui_checkbox_component :housekeeping_enabled,
           _("Enable automatic repository housekeeping"),
           help_text: '%{help_text} %{help_link}'.html_safe % { help_text: help_text, help_link: help_link }
-      - if Feature.enabled?(:optimized_housekeeping)
-        .form-group
-          = f.label :housekeeping_incremental_repack_period, _('Optimize repository period'), class: 'label-bold'
-          = f.number_field :housekeeping_incremental_repack_period, class: 'form-control gl-form-input'
-          .form-text.text-muted
-            = _('Number of Git pushes after which Gitaly is asked to optimize a repository.')
-      - else
-        .form-group
-          = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'label-bold'
-          = f.number_field :housekeeping_incremental_repack_period, class: 'form-control gl-form-input'
-          .form-text.text-muted
-            = html_escape(s_('Number of Git pushes after which an incremental %{code_start}git repack%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
-        .form-group
-          = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'label-bold'
-          = f.number_field :housekeeping_full_repack_period, class: 'form-control gl-form-input'
-          .form-text.text-muted
-            = html_escape(s_('Number of Git pushes after which a full %{code_start}git repack%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
-        .form-group
-          = f.label :housekeeping_gc_period, _('Git GC period'), class: 'label-bold'
-          = f.number_field :housekeeping_gc_period, class: 'form-control gl-form-input'
-          .form-text.text-muted
-            = html_escape(s_('Number of Git pushes after which %{code_start}git gc%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
-
+      .form-group
+        = f.label :housekeeping_optimize_repository_period, _('Optimize repository period'), class: 'label-bold'
+        = f.number_field :housekeeping_optimize_repository_period, class: 'form-control gl-form-input'
+        .form-text.text-muted
+          = _('Number of Git pushes after which Gitaly is asked to optimize a repository.')
     .sub-section
       %h4= s_("AdminSettings|Inactive project deletion")
       .js-inactive-project-deletion-form{ data: inactive_projects_deletion_data(@application_setting) }