Commit 419292e4 authored by Adam Hegyi's avatar Adam Hegyi

Merge branch 'remove-experimental-indexer-column' into 'master'

Remove elasticsearch_experimental_indexer column [step 2]

See merge request gitlab-org/gitlab!30628
parents 1b06aa95 d52e634e
......@@ -5,13 +5,10 @@ class ApplicationSetting < ApplicationRecord
include CacheMarkdownField
include TokenAuthenticatable
include ChronicDurationAttribute
include IgnorableColumns
GRAFANA_URL_ERROR_MESSAGE = 'Please check your Grafana URL setting in ' \
'Admin Area > Settings > Metrics and profiling > Metrics - Grafana'
ignore_column :elasticsearch_experimental_indexer, remove_with: '13.1', remove_after: '2020-05-22'
add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
add_authentication_token_field :health_check_access_token
add_authentication_token_field :static_objects_external_storage_auth_token
......
---
title: Remove elasticsearch_experimental_indexer column
merge_request: 30628
author:
type: other
# frozen_string_literal: true
class RemoveElasticExperimentalIndexerFromApplicationSettings < ActiveRecord::Migration[6.0]
DOWNTIME = false
def change
remove_column :application_settings, :elasticsearch_experimental_indexer, :boolean
end
end
......@@ -288,7 +288,6 @@ CREATE TABLE public.application_settings (
geo_status_timeout integer DEFAULT 10,
uuid character varying,
polling_interval_multiplier numeric DEFAULT 1.0 NOT NULL,
elasticsearch_experimental_indexer boolean,
cached_markdown_version integer,
check_namespace_plan boolean DEFAULT false NOT NULL,
mirror_max_delay integer DEFAULT 300 NOT NULL,
......@@ -13823,6 +13822,7 @@ COPY "schema_migrations" (version) FROM STDIN;
20200424101920
20200424135319
20200427064130
20200428134356
20200429001827
20200429002150
20200429015603
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment