Add latest changes from gitlab-org/gitlab@13-2-stable-ee

14 files changed, 14 insertions, 14 deletions

diff --git a/spec/models/blob_viewer/base_spec.rb b/spec/models/blob_viewer/base_spec.rb
index 39c7a34f052..682b6dc3b1d 100644
--- a/spec/models/blob_viewer/base_spec.rb
+++ b/spec/models/blob_viewer/base_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::Base do
+RSpec.describe BlobViewer::Base do
   include FakeBlobHelpers
 
   let(:project) { build(:project) }
diff --git a/spec/models/blob_viewer/changelog_spec.rb b/spec/models/blob_viewer/changelog_spec.rb
index b71531ff3c2..5346483cfc8 100644
--- a/spec/models/blob_viewer/changelog_spec.rb
+++ b/spec/models/blob_viewer/changelog_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::Changelog do
+RSpec.describe BlobViewer::Changelog do
   include FakeBlobHelpers
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/models/blob_viewer/composer_json_spec.rb b/spec/models/blob_viewer/composer_json_spec.rb
index a6bb64ba121..8d66e9e951f 100644
--- a/spec/models/blob_viewer/composer_json_spec.rb
+++ b/spec/models/blob_viewer/composer_json_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::ComposerJson do
+RSpec.describe BlobViewer::ComposerJson do
   include FakeBlobHelpers
 
   let(:project) { build_stubbed(:project) }
diff --git a/spec/models/blob_viewer/gemspec_spec.rb b/spec/models/blob_viewer/gemspec_spec.rb
index 291d14e2d72..b6f3e059c7e 100644
--- a/spec/models/blob_viewer/gemspec_spec.rb
+++ b/spec/models/blob_viewer/gemspec_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::Gemspec do
+RSpec.describe BlobViewer::Gemspec do
   include FakeBlobHelpers
 
   let(:project) { build_stubbed(:project) }
diff --git a/spec/models/blob_viewer/gitlab_ci_yml_spec.rb b/spec/models/blob_viewer/gitlab_ci_yml_spec.rb
index e645733e02d..cd885d312dc 100644
--- a/spec/models/blob_viewer/gitlab_ci_yml_spec.rb
+++ b/spec/models/blob_viewer/gitlab_ci_yml_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::GitlabCiYml do
+RSpec.describe BlobViewer::GitlabCiYml do
   include FakeBlobHelpers
   include RepoHelpers
 
diff --git a/spec/models/blob_viewer/go_mod_spec.rb b/spec/models/blob_viewer/go_mod_spec.rb
index ba6038533ea..21e84d39a54 100644
--- a/spec/models/blob_viewer/go_mod_spec.rb
+++ b/spec/models/blob_viewer/go_mod_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::GoMod do
+RSpec.describe BlobViewer::GoMod do
   include FakeBlobHelpers
 
   let(:project) { build_stubbed(:project) }
diff --git a/spec/models/blob_viewer/license_spec.rb b/spec/models/blob_viewer/license_spec.rb
index b0426401932..bc970136503 100644
--- a/spec/models/blob_viewer/license_spec.rb
+++ b/spec/models/blob_viewer/license_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::License do
+RSpec.describe BlobViewer::License do
   include FakeBlobHelpers
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/models/blob_viewer/metrics_dashboard_yml_spec.rb b/spec/models/blob_viewer/metrics_dashboard_yml_spec.rb
index f5b8586975d..057f0f32158 100644
--- a/spec/models/blob_viewer/metrics_dashboard_yml_spec.rb
+++ b/spec/models/blob_viewer/metrics_dashboard_yml_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::MetricsDashboardYml do
+RSpec.describe BlobViewer::MetricsDashboardYml do
   include FakeBlobHelpers
   include RepoHelpers
 
diff --git a/spec/models/blob_viewer/package_json_spec.rb b/spec/models/blob_viewer/package_json_spec.rb
index 7f7b1dcfcb3..d2e8ab6575f 100644
--- a/spec/models/blob_viewer/package_json_spec.rb
+++ b/spec/models/blob_viewer/package_json_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::PackageJson do
+RSpec.describe BlobViewer::PackageJson do
   include FakeBlobHelpers
 
   let(:project) { build_stubbed(:project) }
diff --git a/spec/models/blob_viewer/podspec_json_spec.rb b/spec/models/blob_viewer/podspec_json_spec.rb
index dd5ed03b77d..61d2602c413 100644
--- a/spec/models/blob_viewer/podspec_json_spec.rb
+++ b/spec/models/blob_viewer/podspec_json_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::PodspecJson do
+RSpec.describe BlobViewer::PodspecJson do
   include FakeBlobHelpers
 
   let(:project) { build_stubbed(:project) }
diff --git a/spec/models/blob_viewer/podspec_spec.rb b/spec/models/blob_viewer/podspec_spec.rb
index 2d9b184c5cb..0a0fbcaebd4 100644
--- a/spec/models/blob_viewer/podspec_spec.rb
+++ b/spec/models/blob_viewer/podspec_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::Podspec do
+RSpec.describe BlobViewer::Podspec do
   include FakeBlobHelpers
 
   let(:project) { build_stubbed(:project) }
diff --git a/spec/models/blob_viewer/readme_spec.rb b/spec/models/blob_viewer/readme_spec.rb
index 89bc5be94fb..4c5f11d55ff 100644
--- a/spec/models/blob_viewer/readme_spec.rb
+++ b/spec/models/blob_viewer/readme_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::Readme do
+RSpec.describe BlobViewer::Readme do
   include FakeBlobHelpers
 
   let(:project) { create(:project, :repository, :wiki_repo) }
diff --git a/spec/models/blob_viewer/route_map_spec.rb b/spec/models/blob_viewer/route_map_spec.rb
index 6c703df5c4c..bb0284d7868 100644
--- a/spec/models/blob_viewer/route_map_spec.rb
+++ b/spec/models/blob_viewer/route_map_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::RouteMap do
+RSpec.describe BlobViewer::RouteMap do
   include FakeBlobHelpers
 
   let(:project) { build_stubbed(:project) }
diff --git a/spec/models/blob_viewer/server_side_spec.rb b/spec/models/blob_viewer/server_side_spec.rb
index f95305abe78..284ac4524f7 100644
--- a/spec/models/blob_viewer/server_side_spec.rb
+++ b/spec/models/blob_viewer/server_side_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobViewer::ServerSide do
+RSpec.describe BlobViewer::ServerSide do
   include FakeBlobHelpers
 
   let(:project) { build(:project) }