Add latest changes from gitlab-org/gitlab@14-7-stable-ee

2 files changed, 11 insertions, 1 deletions

diff --git a/spec/features/admin/dashboard_spec.rb b/spec/features/admin/dashboard_spec.rb
index 112dc9e01d8..e7ff8c23a8c 100644
--- a/spec/features/admin/dashboard_spec.rb
+++ b/spec/features/admin/dashboard_spec.rb
@@ -53,4 +53,14 @@ RSpec.describe 'admin visits dashboard' do
       expect(page).to have_content('Active users 71')
     end
   end
+
+  describe 'Version check', :js do
+    it 'shows badge on CE' do
+      visit admin_root_path
+
+      page.within('.admin-dashboard') do
+        expect(find('.badge')).to have_content('Up to date')
+      end
+    end
+  end
 end
diff --git a/spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb b/spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb
index d3ce916cd64..744262d79ea 100644
--- a/spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb
+++ b/spec/support/shared_examples/models/clusters/elastic_stack_client_shared.rb
@@ -47,7 +47,7 @@ RSpec.shared_examples 'cluster-based #elasticsearch_client' do |factory|
       it 'copies proxy_url, options and headers from kube client to elasticsearch_client' do
         expect(Elasticsearch::Client)
           .to(receive(:new))
-          .with(url: a_valid_url)
+          .with(url: a_valid_url, adapter: :net_http)
           .and_call_original
 
         client = subject.elasticsearch_client