Commit 3566103a authored by Robert Speicher's avatar Robert Speicher

Merge branch 'link-elastic-progress-to-elastic-commit-indexer-instead' into 'master'

Link Elasticsearch indexing progress to elastic_commit_indexer

See merge request gitlab-org/gitlab!40928
parents 45b6e983 18f3def5
...@@ -8,7 +8,7 @@ class Admin::ElasticsearchController < Admin::ApplicationController ...@@ -8,7 +8,7 @@ class Admin::ElasticsearchController < Admin::ApplicationController
::Elastic::IndexProjectsService.new.execute ::Elastic::IndexProjectsService.new.execute
notice = _('Elasticsearch indexing started') notice = _('Elasticsearch indexing started')
queue_link = helpers.link_to(_('(check progress)'), sidekiq_path + '/queues/elastic_full_index') queue_link = helpers.link_to(_('(check progress)'), sidekiq_path + '/queues/elastic_commit_indexer')
flash[:notice] = "#{notice} #{queue_link}".html_safe flash[:notice] = "#{notice} #{queue_link}".html_safe
else else
flash[:warning] = _('Please create an index before enabling indexing') flash[:warning] = _('Please create an index before enabling indexing')
......
---
title: Link Elasticsearch indexing progress to elastic_commit_indexer
merge_request: 40928
author:
type: changed
...@@ -18,7 +18,7 @@ RSpec.describe Admin::ElasticsearchController do ...@@ -18,7 +18,7 @@ RSpec.describe Admin::ElasticsearchController do
post :enqueue_index post :enqueue_index
expect(controller).to set_flash[:notice].to include('/admin/sidekiq/queues/elastic_full_index') expect(controller).to set_flash[:notice].to include('/admin/sidekiq/queues/elastic_commit_indexer')
expect(response).to redirect_to general_admin_application_settings_path(anchor: 'js-elasticsearch-settings') expect(response).to redirect_to general_admin_application_settings_path(anchor: 'js-elasticsearch-settings')
end end
......
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