Merge branch 'UNQUARANTINE197207' into 'master'

Explicitly add erubi to Gemfile and unquarantine elasticsearch_reindexing_spec test

Closes #199911 and #197207

See merge request gitlab-org/gitlab!23700

Gemfile

@@ -486,3 +486,5 @@ gem 'liquid', '~> 4.0'
 
 # LRU cache
 gem 'lru_redux'
+
+gem 'erubi', '~> 1.9.0'

Gemfile.lock

@@ -1205,6 +1205,7 @@ DEPENDENCIES
   elasticsearch-rails (~> 6.1)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  erubi (~> 1.9.0)
   escape_utils (~> 1.1)
   factory_bot_rails (~> 5.1.0)
   faraday (~> 0.12)

qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Elasticsearch advanced global search with advanced syntax', :orchestrated, :elasticsearch, :requires_admin, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/197207' do
+    describe 'Elasticsearch advanced global search with advanced syntax', :orchestrated, :elasticsearch, :requires_admin do
       let(:project_name_suffix) { SecureRandom.hex(8) }
       let(:project_file_name) { 'elasticsearch.rb' }
       let(:project_file_content) { "elasticsearch: #{SecureRandom.hex(8)}" }

qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Search using Elasticsearch', :orchestrated, :elasticsearch, :requires_admin, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/197207' do
+    describe 'Search using Elasticsearch', :orchestrated, :elasticsearch, :requires_admin do
       include Runtime::Fixtures
 
       before do