summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Mishunov <dmishunov@gitlab.com>2019-08-27 11:59:59 +0200
committerMark Chao <mchao@gitlab.com>2019-09-11 17:43:29 +0800
commitd3d274911f15f7013f3b0f08f5c9790a91c02ba6 (patch)
tree6939f8f9af4f3bab62138b17bd9d3f1ddb159a73
parent1ba9f029e89e99a245a201c21a98f4f79dc7b302 (diff)
downloadgitlab-ce-13533-elastic-search-1-ce.tar.gz
CE port of 13533-elastic-search-113533-elastic-search-1-ce
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.
-rw-r--r--app/assets/stylesheets/framework/forms.scss10
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
-rw-r--r--app/views/admin/application_settings/integrations.html.haml2
-rw-r--r--app/views/layouts/nav/sidebar/_admin.html.haml2
-rw-r--r--doc/administration/geo/replication/updating_the_geo_nodes.md3
5 files changed, 15 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 69ef116043a..20b7c6d4564 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -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%;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index faa0a9909d5..857c22f8cd7 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -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;
diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml
index 310e86b1377..9969f91bbf2 100644
--- a/app/views/admin/application_settings/integrations.html.haml
+++ b/app/views/admin/application_settings/integrations.html.haml
@@ -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
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index f76268bc29b..2f9ad8a70e6 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -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
diff --git a/doc/administration/geo/replication/updating_the_geo_nodes.md b/doc/administration/geo/replication/updating_the_geo_nodes.md
index fda0ebbbeac..e5a309f7c4d 100644
--- a/doc/administration/geo/replication/updating_the_geo_nodes.md
+++ b/doc/administration/geo/replication/updating_the_geo_nodes.md
@@ -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).