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
75e4c9fc
Commit
75e4c9fc
authored
Sep 22, 2020
by
Dmitry Gruzd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ES cache feature flags
parent
0efd0a0b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
30 deletions
+0
-30
ee/app/models/ee/application_setting.rb
ee/app/models/ee/application_setting.rb
+0
-4
ee/config/feature_flags/development/elasticsearch_indexes_namespace_cache.yml
...ags/development/elasticsearch_indexes_namespace_cache.yml
+0
-7
ee/config/feature_flags/development/elasticsearch_indexes_project_cache.yml
...flags/development/elasticsearch_indexes_project_cache.yml
+0
-7
ee/spec/models/application_setting_spec.rb
ee/spec/models/application_setting_spec.rb
+0
-12
No files found.
ee/app/models/ee/application_setting.rb
View file @
75e4c9fc
...
...
@@ -150,8 +150,6 @@ module EE
return
false
unless
elasticsearch_indexing?
return
true
unless
elasticsearch_limit_indexing?
return
elasticsearch_limited_project_exists?
(
project
)
unless
::
Feature
.
enabled?
(
:elasticsearch_indexes_project_cache
,
default_enabled:
true
)
::
Gitlab
::
Elastic
::
ElasticsearchEnabledCache
.
fetch
(
:project
,
project
.
id
)
do
elasticsearch_limited_project_exists?
(
project
)
end
...
...
@@ -161,8 +159,6 @@ module EE
return
false
unless
elasticsearch_indexing?
return
true
unless
elasticsearch_limit_indexing?
elasticsearch_limited_namespaces
.
exists?
(
namespace
.
id
)
unless
::
Feature
.
enabled?
(
:elasticsearch_indexes_namespace_cache
,
default_enabled:
true
)
::
Gitlab
::
Elastic
::
ElasticsearchEnabledCache
.
fetch
(
:namespace
,
namespace
.
id
)
do
elasticsearch_limited_namespaces
.
exists?
(
namespace
.
id
)
end
...
...
ee/config/feature_flags/development/elasticsearch_indexes_namespace_cache.yml
deleted
100644 → 0
View file @
0efd0a0b
---
name
:
elasticsearch_indexes_namespace_cache
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41274
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/244847
group
:
group::global search
type
:
development
default_enabled
:
true
ee/config/feature_flags/development/elasticsearch_indexes_project_cache.yml
deleted
100644 → 0
View file @
0efd0a0b
---
name
:
elasticsearch_indexes_project_cache
introduced_by_url
:
rollout_issue_url
:
group
:
type
:
development
default_enabled
:
true
ee/spec/models/application_setting_spec.rb
View file @
75e4c9fc
...
...
@@ -395,18 +395,6 @@ RSpec.describe ApplicationSetting do
expect
(
setting
.
elasticsearch_indexes_project?
(
projects
.
first
)).
to
be
(
true
)
end
context
'when elasticsearch_indexes_project_cache feature flag is disabled'
do
before
do
stub_feature_flags
(
elasticsearch_indexes_project_cache:
false
)
end
it
'does not use the cache'
do
expect
(
::
Gitlab
::
Elastic
::
ElasticsearchEnabledCache
).
not_to
receive
(
:fetch
)
expect
(
setting
.
elasticsearch_indexes_project?
(
projects
.
first
)).
to
be
(
false
)
end
end
end
end
end
...
...
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