Commit d9579427 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '198522-rename-es-advanced-search' into 'master'

Rename Elasticsearch to Advanced Search in Admin UI

Closes #198522

See merge request gitlab-org/gitlab!42048
parents c35cf78d efac7959
This diff is collapsed.
......@@ -8,11 +8,11 @@
%section.settings.as-elasticsearch.no-animate#js-elasticsearch-settings{ class: ('expanded' if expanded), data: { qa_selector: 'elasticsearch_tab' } }
.settings-header
%h4
= _('Elasticsearch')
= _('Advanced Search')
%button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand'
%p
= _('Elasticsearch integration. Elasticsearch AWS IAM.')
= _('Advanced Search with Elasticsearch')
.settings-content
= 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
......
= feature_entry(_('Elasticsearch'),
= feature_entry(_('Advanced Search'),
href: general_admin_application_settings_path(anchor: 'js-elasticsearch-settings'),
doc_href: help_page_path('integration/elasticsearch'),
enabled: Gitlab::CurrentSettings.elasticsearch_search?)
......
---
title: Rename Elasticsearch to Advanced Search in Admin UI
merge_request: 42048
author:
type: other
......@@ -2139,6 +2139,12 @@ msgstr ""
msgid "Advanced"
msgstr ""
msgid "Advanced Search"
msgstr ""
msgid "Advanced Search with Elasticsearch"
msgstr ""
msgid "Advanced Settings"
msgstr ""
......@@ -9273,9 +9279,6 @@ msgstr ""
msgid "Editing"
msgstr ""
msgid "Elasticsearch"
msgstr ""
msgid "Elasticsearch AWS IAM credentials"
msgstr ""
......@@ -9288,9 +9291,6 @@ msgstr ""
msgid "Elasticsearch indexing started"
msgstr ""
msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr ""
msgid "Elasticsearch reindexing is already in progress"
msgstr ""
......
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