Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 13 deletions

diff --git a/spec/finders/template_finder_spec.rb b/spec/finders/template_finder_spec.rb
index c466f533a61..c2b42cf0eb3 100644
--- a/spec/finders/template_finder_spec.rb
+++ b/spec/finders/template_finder_spec.rb
@@ -20,7 +20,6 @@ RSpec.describe TemplateFinder do
       :dockerfiles    | 'Binary'
       :gitignores     | 'Actionscript'
       :gitlab_ci_ymls | 'Android'
-      :metrics_dashboard_ymls | 'Default'
     end
 
     with_them do
@@ -112,7 +111,6 @@ RSpec.describe TemplateFinder do
       :gitignores     | described_class
       :gitlab_ci_ymls | described_class
       :licenses | ::LicenseTemplateFinder
-      :metrics_dashboard_ymls | described_class
       :issues | described_class
       :merge_requests | described_class
     end
@@ -123,16 +121,6 @@ RSpec.describe TemplateFinder do
       it { is_expected.to be_a(expected_class) }
       it { expect(finder.project).to eq(project) }
     end
-
-    context 'when metrics dashboard is unavailable' do
-      before do
-        stub_feature_flags(remove_monitor_metrics: true)
-      end
-
-      subject(:finder) { described_class.build(:metrics_dashboard_ymls, project) }
-
-      it { is_expected.to be_nil }
-    end
   end
 
   describe '#execute' do
@@ -178,7 +166,6 @@ RSpec.describe TemplateFinder do
       :dockerfiles    | 'Binary'
       :gitignores     | 'Actionscript'
       :gitlab_ci_ymls | 'Android'
-      :metrics_dashboard_ymls | 'Default'
     end
 
     with_them do