提交 d3d27491 编写于 作者: D Denys Mishunov 提交者: Mark Chao

CE port of 13533-elastic-search-1

Moved Elasticsearch menu item to top menu

Moved the item out of "Settings/Integrations" into the separate entity
with two subitems:

- GitLab index
- Settings

as part of the move to the dedicated Elasticsearch panel.

Elasticsearch: GitLab Index admin page

Migrate feature spec

Fixing feature tests

Added a changelog entry

Fixed Elasticsearch translations

Making linting for MD happy

Introduction of input-xs/sm classes

Pajamas assumes several sizes of the inputs that are not in gitlab yet.
This commit introduces the two smallest input widths (input-xs and
input-sm) that are part of the Admin -> Elastissearch form.
上级 1ba9f029
......@@ -232,6 +232,16 @@ label {
color: $gray-600;
}
.input-xs {
max-width: $input-xs-width;
width: 100%;
}
.input-sm {
max-width: $input-sm-width;
width: 100%;
}
.input-md {
max-width: $input-md-width;
width: 100%;
......
......@@ -636,6 +636,8 @@ $gl-field-focus-shadow: rgba(0, 0, 0, 0.075);
$gl-field-focus-shadow-error: rgba($red-500, 0.6);
$input-short-width: 200px;
$input-short-md-width: 280px;
$input-xs-width: 80px;
$input-sm-width: 160px;
$input-md-width: 240px;
$input-lg-width: 320px;
......
......@@ -2,8 +2,6 @@
- page_title _("Integrations")
- @content_class = "limit-container-width" unless fluid_layout
= render_if_exists 'admin/application_settings/elasticsearch_form', expanded: expanded_by_default?
%section.settings.as-plantuml.no-animate#js-plantuml-settings{ class: ('expanded' if expanded_by_default?) }
.settings-header
%h4
......
......@@ -170,6 +170,8 @@
= render_if_exists 'layouts/nav/ee/admin/geo_sidebar'
= render_if_exists 'layouts/nav/sidebar/elasticsearch_link'
= nav_link(controller: :deploy_keys) do
= link_to admin_deploy_keys_path do
.nav-icon-container
......
......@@ -26,8 +26,7 @@ different steps.
NOTE: **Note:** These general update steps are not intended for [high-availability deployments](https://docs.gitlab.com/omnibus/update/README.html#multi-node--ha-deployment), and will cause downtime. If you want to avoid downtime, consider using [zero downtime updates](https://docs.gitlab.com/omnibus/update/README.html#zero-downtime-updates).
To update the Geo nodes when a new GitLab version is released, update **primary**
and all **secondary** nodes:
To update the Geo nodes when a new GitLab version is released, update **primary** and all **secondary** nodes:
1. Log into the **primary** node.
1. [Update GitLab on the **primary** node using Omnibus](https://docs.gitlab.com/omnibus/update/README.html).
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册