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
efac7959
Commit
efac7959
authored
Sep 16, 2020
by
Changzheng Liu
Committed by
Martin Wortschack
Sep 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Elasticsearch to Advanced Search in Admin UI
parent
79fd8158
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
28 deletions
+33
-28
doc/integration/elasticsearch.md
doc/integration/elasticsearch.md
+19
-19
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
.../admin/application_settings/_elasticsearch_form.html.haml
+2
-2
ee/app/views/admin/dashboard/_elastic_and_geo.html.haml
ee/app/views/admin/dashboard/_elastic_and_geo.html.haml
+1
-1
ee/changelogs/unreleased/198522-rename-es-advanced-search.yml
...hangelogs/unreleased/198522-rename-es-advanced-search.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-6
No files found.
doc/integration/elasticsearch.md
View file @
efac7959
This diff is collapsed.
Click to expand it.
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
View file @
efac7959
...
@@ -8,11 +8,11 @@
...
@@ -8,11 +8,11 @@
%section
.settings.as-elasticsearch.no-animate
#js-elasticsearch-settings
{
class:
(
'expanded'
if
expanded
),
data:
{
qa_selector:
'elasticsearch_tab'
}
}
%section
.settings.as-elasticsearch.no-animate
#js-elasticsearch-settings
{
class:
(
'expanded'
if
expanded
),
data:
{
qa_selector:
'elasticsearch_tab'
}
}
.settings-header
.settings-header
%h4
%h4
=
_
(
'
Elastics
earch'
)
=
_
(
'
Advanced S
earch'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
expanded
?
'Collapse'
:
'Expand'
=
expanded
?
'Collapse'
:
'Expand'
%p
%p
=
_
(
'
Elasticsearch integration. Elasticsearch AWS IAM.
'
)
=
_
(
'
Advanced Search with Elasticsearch
'
)
.settings-content
.settings-content
=
form_for
@application_setting
,
url:
general_admin_application_settings_path
(
anchor:
'js-elasticsearch-settings'
),
html:
{
class:
'fieldset-form'
}
do
|
f
|
=
form_for
@application_setting
,
url:
general_admin_application_settings_path
(
anchor:
'js-elasticsearch-settings'
),
html:
{
class:
'fieldset-form'
}
do
|
f
|
=
form_errors
(
@application_setting
)
if
expanded
=
form_errors
(
@application_setting
)
if
expanded
...
...
ee/app/views/admin/dashboard/_elastic_and_geo.html.haml
View file @
efac7959
=
feature_entry
(
_
(
'
Elastics
earch'
),
=
feature_entry
(
_
(
'
Advanced S
earch'
),
href:
general_admin_application_settings_path
(
anchor:
'js-elasticsearch-settings'
),
href:
general_admin_application_settings_path
(
anchor:
'js-elasticsearch-settings'
),
doc_href:
help_page_path
(
'integration/elasticsearch'
),
doc_href:
help_page_path
(
'integration/elasticsearch'
),
enabled:
Gitlab
::
CurrentSettings
.
elasticsearch_search?
)
enabled:
Gitlab
::
CurrentSettings
.
elasticsearch_search?
)
...
...
ee/changelogs/unreleased/198522-rename-es-advanced-search.yml
0 → 100644
View file @
efac7959
---
title
:
Rename Elasticsearch to Advanced Search in Admin UI
merge_request
:
42048
author
:
type
:
other
locale/gitlab.pot
View file @
efac7959
...
@@ -2139,6 +2139,12 @@ msgstr ""
...
@@ -2139,6 +2139,12 @@ msgstr ""
msgid "Advanced"
msgid "Advanced"
msgstr ""
msgstr ""
msgid "Advanced Search"
msgstr ""
msgid "Advanced Search with Elasticsearch"
msgstr ""
msgid "Advanced Settings"
msgid "Advanced Settings"
msgstr ""
msgstr ""
...
@@ -9273,9 +9279,6 @@ msgstr ""
...
@@ -9273,9 +9279,6 @@ msgstr ""
msgid "Editing"
msgid "Editing"
msgstr ""
msgstr ""
msgid "Elasticsearch"
msgstr ""
msgid "Elasticsearch AWS IAM credentials"
msgid "Elasticsearch AWS IAM credentials"
msgstr ""
msgstr ""
...
@@ -9288,9 +9291,6 @@ msgstr ""
...
@@ -9288,9 +9291,6 @@ msgstr ""
msgid "Elasticsearch indexing started"
msgid "Elasticsearch indexing started"
msgstr ""
msgstr ""
msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr ""
msgid "Elasticsearch reindexing is already in progress"
msgid "Elasticsearch reindexing is already in progress"
msgstr ""
msgstr ""
...
...
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