Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d52e634e
Commit
d52e634e
authored
Apr 29, 2020
by
Dmitry Gruzd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove elasticsearch_experimental_indexer column
parent
82097be5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
4 deletions
+14
-4
app/models/application_setting.rb
app/models/application_setting.rb
+0
-3
changelogs/unreleased/remove-experimental-indexer-column.yml
changelogs/unreleased/remove-experimental-indexer-column.yml
+5
-0
db/post_migrate/20200428134356_remove_elastic_experimental_indexer_from_application_settings.rb
...elastic_experimental_indexer_from_application_settings.rb
+8
-0
db/structure.sql
db/structure.sql
+1
-1
No files found.
app/models/application_setting.rb
View file @
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
...
...
changelogs/unreleased/remove-experimental-indexer-column.yml
0 → 100644
View file @
d52e634e
---
title
:
Remove elasticsearch_experimental_indexer column
merge_request
:
30628
author
:
type
:
other
db/post_migrate/20200428134356_remove_elastic_experimental_indexer_from_application_settings.rb
0 → 100644
View file @
d52e634e
# frozen_string_literal: true
class
RemoveElasticExperimentalIndexerFromApplicationSettings
<
ActiveRecord
::
Migration
[
6.0
]
DOWNTIME
=
false
def
change
remove_column
:application_settings
,
:elasticsearch_experimental_indexer
,
:boolean
end
end
db/structure.sql
View file @
d52e634e
...
...
@@ -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
,
...
...
@@ -13821,6 +13820,7 @@ COPY "schema_migrations" (version) FROM STDIN;
20200424101920
20200424135319
20200427064130
20200428134356
20200429001827
20200429002150
20200429015603
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment