Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 1 insertions, 31 deletions

diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb
index 5494b908705..6c7d8d2c165 100644
--- a/spec/views/admin/dashboard/index.html.haml_spec.rb
+++ b/spec/views/admin/dashboard/index.html.haml_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe 'admin/dashboard/index.html.haml' do
   it "includes revision of GitLab" do
     render
 
-    expect(rendered).to have_content "#{Gitlab::VERSION} (#{Gitlab.revision})"
+    expect(rendered).to have_content "#{Gitlab::VERSION} #{Gitlab.revision}"
   end
 
   it 'does not include license breakdown' do
diff --git a/spec/views/admin/services/index.html.haml_spec.rb b/spec/views/admin/services/index.html.haml_spec.rb
deleted file mode 100644
index e8cd2dde67e..00000000000
--- a/spec/views/admin/services/index.html.haml_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'admin/services/index.html.haml' do
-  before do
-    assign(:services, build_stubbed_list(:service, 1))
-    assign(:existing_instance_types, [])
-  end
-
-  context 'user has not dismissed Service Templates deprecation message' do
-    it 'shows the message' do
-      allow(view).to receive(:show_service_templates_deprecated?).and_return(true)
-
-      render
-
-      expect(rendered).to have_content('Service Templates will soon be deprecated.')
-    end
-  end
-
-  context 'user has dismissed Service Templates deprecation message' do
-    it 'does not show the message' do
-      allow(view).to receive(:show_service_templates_deprecated?).and_return(false)
-
-      render
-
-      expect(rendered).not_to have_content('Service Templates will soon be deprecated.')
-    end
-  end
-end