Merge branch '208764-fix-qa-failure' into 'master'

Fix QA specs 500 error

Closes #208764

See merge request gitlab-org/gitlab!26598

ee/app/services/ee/application_settings/update_service.rb

@@ -45,7 +45,7 @@ module EE
 
       def prevent_elasticsearch_indexing_update?
         !application_setting.elasticsearch_indexing &&
-          params[:elasticsearch_indexing].to_i.positive? &&
+          ::Gitlab::Utils.to_boolean(params[:elasticsearch_indexing]) &&
           !::Gitlab::Elastic::Helper.index_exists?
       end
     end

ee/spec/controllers/admin/application_settings_controller_spec.rb

@@ -20,7 +20,7 @@ describe Admin::ApplicationSettingsController do
       settings = {
           help_text: 'help_text',
           elasticsearch_url: 'http://my-elastic.search:9200',
-          elasticsearch_indexing: true,
+          elasticsearch_indexing: false,
           elasticsearch_aws: true,
           elasticsearch_aws_access_key: 'elasticsearch_aws_access_key',
           elasticsearch_aws_secret_access_key: 'elasticsearch_aws_secret_access_key',