Merge branch 'ag-remove-maintenance-mode-ff-yml' into 'master'

Remove maintenance mode feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!53895

config/feature_flags/development/maintenance_mode.yml

----
-name: maintenance_mode
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28158
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/217895
-milestone: '12.10'
-type: development
-group: group::geo
-default_enabled: false

ee/app/controllers/ee/admin/application_settings_controller.rb

@@ -57,7 +57,7 @@ module EE
           attrs += EE::ApplicationSettingsHelper.merge_request_appovers_rules_attributes
         end
 
-        if ::Gitlab::Geo.license_allows? && ::Feature.enabled?(:maintenance_mode)
+        if ::Gitlab::Geo.license_allows?
           attrs << :maintenance_mode
           attrs << :maintenance_mode_message
         end

ee/app/views/admin/application_settings/_maintenance_mode_settings_form.html.haml

-- return unless ::Gitlab::Geo.license_allows? && Feature.enabled?(:maintenance_mode)
+- return unless ::Gitlab::Geo.license_allows?
 
 %section.settings.no-animate#js-maintenance-mode-toggle{ class: ('expanded' if expanded_by_default?) }
   .settings-header

ee/changelogs/unreleased/ag-remove-maintenance-mode-ff-yml.yml

+---
+title: Release maintenance mode
+merge_request: 53895
+author:
+type: added

ee/lib/ee/api/entities/application_setting.rb

@@ -20,8 +20,8 @@ module EE
           expose :updating_name_disabled_for_users, if: ->(_instance, _opts) { ::License.feature_available?(:disable_name_update_for_users) }
           expose :npm_package_requests_forwarding, if: ->(_instance, _opts) { ::License.feature_available?(:package_forwarding) }
           expose :group_owners_can_manage_default_branch_protection, if: ->(_instance, _opts) { ::License.feature_available?(:default_branch_protection_restriction_in_groups) }
-          expose :maintenance_mode, if: ->(_instance, _opts) { ::Gitlab::Geo.license_allows? && ::Feature.enabled?(:maintenance_mode) }
-          expose :maintenance_mode_message, if: ->(_instance, _opts) { ::Gitlab::Geo.license_allows? && ::Feature.enabled?(:maintenance_mode) }
+          expose :maintenance_mode, if: ->(_instance, _opts) { ::Gitlab::Geo.license_allows? }
+          expose :maintenance_mode_message, if: ->(_instance, _opts) { ::Gitlab::Geo.license_allows? }
           expose :git_two_factor_session_expiry, if: ->(_instance, _opts) { License.feature_available?(:git_two_factor_enforcement) && ::Feature.enabled?(:two_factor_for_cli) }
         end
       end

ee/lib/ee/api/settings.rb

@@ -52,7 +52,7 @@ module EE
               attrs = attrs.except(:git_two_factor_session_expiry)
             end
 
-            unless ::Gitlab::Geo.license_allows? && ::Feature.enabled?(:maintenance_mode)
+            unless ::Gitlab::Geo.license_allows?
               attrs = attrs.except(:maintenance_mode, :maintenance_mode_message)
             end
 

ee/spec/views/admin/application_settings/general.html.haml_spec.rb

@@ -30,18 +30,10 @@ RSpec.describe 'admin/application_settings/general.html.haml' do
       end
     end
 
-    context 'when maintenance_mode feature is enabled' do
+    context 'when license allows' do
       it 'shows the Maintenance mode section' do
         expect(rendered).to have_css('#js-maintenance-mode-toggle')
       end
     end
-
-    context 'when maintenance_mode feature is disabled' do
-      let(:maintenance_mode_flag) { false }
-
-      it 'does not show the Maintenance mode section' do
-        expect(rendered).not_to have_css('#js-maintenance-mode-toggle')
-      end
-    end
   end
 end

lib/gitlab.rb

@@ -121,7 +121,6 @@ module Gitlab
   end
 
   def self.maintenance_mode?
-    return false unless ::Feature.enabled?(:maintenance_mode)
     return false unless ::Gitlab::CurrentSettings.current_application_settings?
 
     ::Gitlab::CurrentSettings.maintenance_mode