From 2be5fc3dba72d50cb2cd5d358e29bc6b6616346c Mon Sep 17 00:00:00 2001
From: Erick Banks <ebanks@gitlab.com>
Date: Fri, 31 Jan 2020 10:13:54 +0200
Subject: [PATCH] Add erubi explicitly to Gemfile
---
Gemfile | 2 ++
Gemfile.lock | 1 +
.../advanced_global_advanced_syntax_search_spec.rb | 2 +-
.../enablement/elasticsearch/elasticsearch_reindexing_spec.rb | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Gemfile b/Gemfile
index bb486a20ce42e..310195262ff11 100644
--- a/Gemfile
+++ b/Gemfile
@@ -487,3 +487,5 @@ gem 'liquid', '~> 4.0'
# LRU cache
gem 'lru_redux'
+
+gem 'erubi', '~> 1.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 58a4f1ad53d90..53cf1a8d8a5f8 100644
--- a/Gemfile.lock
+++ b/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)
diff --git a/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb b/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb
index 1f755742c766e..03e0cc508b4d3 100644
--- a/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb
+++ b/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)}" }
diff --git a/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb b/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb
index 93d30a677f77f..5c003952aa149 100644
--- a/qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb
+++ b/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
--
GitLab