Commit 379a75a3 authored by Vasilii Iakliushin's avatar Vasilii Iakliushin

Merge branch...

Merge branch '354595-migrate-to-shared-alert-haml-partial-in-ee-app-views-admin-application_settings' into 'master'

Migrate to alert advanced_search to shared global alert

See merge request gitlab-org/gitlab!82871
parents f053818b a0715875
...@@ -11,13 +11,12 @@ ...@@ -11,13 +11,12 @@
- if @elasticsearch_warn_if_not_using_aliases - if @elasticsearch_warn_if_not_using_aliases
- content_for :page_level_alert do - content_for :page_level_alert do
%div{ class: [container_class, @content_class, 'gl-pt-5!'] } %div{ class: [container_class, @content_class, 'gl-pt-5!'] }
.gl-alert{ class: ['gl-alert-warning'] } = render 'shared/global_alert',
= sprite_icon('warning', size: 16, css_class: "gl-alert-icon") title: s_('AdvancedSearch|Reindex required'),
.gl-alert-content{ role: 'alert' } dismissible: false,
%h4.gl-alert-title variant: :warning do
= s_('AdvancedSearch|Reindex required') .gl-alert-body
.gl-alert-body = s_('Introduced in GitLab 13.1, before using %{reindexing_link_start}zero-downtime reindexing%{link_end} and %{migrations_link_start}Advanced Search migrations%{link_end}, you need to %{recreate_link_start}recreate your index%{link_end}.').html_safe % { reindexing_link_start: help_zero_downtime_reindexing_link_start, migrations_link_start: help_advanced_search_migrations_link_start, recreate_link_start: help_recreate_index_link_start, link_end: '</a>'.html_safe }
= s_('Introduced in GitLab 13.1, before using %{reindexing_link_start}zero-downtime reindexing%{link_end} and %{migrations_link_start}Advanced Search migrations%{link_end}, you need to %{recreate_link_start}recreate your index%{link_end}.').html_safe % { reindexing_link_start: help_zero_downtime_reindexing_link_start, migrations_link_start: help_advanced_search_migrations_link_start, recreate_link_start: help_recreate_index_link_start, link_end: '</a>'.html_safe }
= render_if_exists 'admin/application_settings/elasticsearch_form' = render_if_exists 'admin/application_settings/elasticsearch_form'
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