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

8 files changed, 8 insertions, 8 deletions

diff --git a/spec/lib/gitlab/sherlock/collection_spec.rb b/spec/lib/gitlab/sherlock/collection_spec.rb
index bdc89c3d3cf..fcf8e6638f8 100644
--- a/spec/lib/gitlab/sherlock/collection_spec.rb
+++ b/spec/lib/gitlab/sherlock/collection_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Sherlock::Collection do
+RSpec.describe Gitlab::Sherlock::Collection do
   let(:collection) { described_class.new }
 
   let(:transaction) do
diff --git a/spec/lib/gitlab/sherlock/file_sample_spec.rb b/spec/lib/gitlab/sherlock/file_sample_spec.rb
index b09ba5c62dc..8a1aa51e2d4 100644
--- a/spec/lib/gitlab/sherlock/file_sample_spec.rb
+++ b/spec/lib/gitlab/sherlock/file_sample_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Sherlock::FileSample do
+RSpec.describe Gitlab::Sherlock::FileSample do
   let(:sample) { described_class.new(__FILE__, [], 150.4, 2) }
 
   describe '#id' do
diff --git a/spec/lib/gitlab/sherlock/line_profiler_spec.rb b/spec/lib/gitlab/sherlock/line_profiler_spec.rb
index c1997606839..2220a2cafc8 100644
--- a/spec/lib/gitlab/sherlock/line_profiler_spec.rb
+++ b/spec/lib/gitlab/sherlock/line_profiler_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Sherlock::LineProfiler do
+RSpec.describe Gitlab::Sherlock::LineProfiler do
   let(:profiler) { described_class.new }
 
   describe '#profile' do
diff --git a/spec/lib/gitlab/sherlock/line_sample_spec.rb b/spec/lib/gitlab/sherlock/line_sample_spec.rb
index b68e8cc0266..db031377787 100644
--- a/spec/lib/gitlab/sherlock/line_sample_spec.rb
+++ b/spec/lib/gitlab/sherlock/line_sample_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Sherlock::LineSample do
+RSpec.describe Gitlab::Sherlock::LineSample do
   let(:sample) { described_class.new(150.0, 4) }
 
   describe '#duration' do
diff --git a/spec/lib/gitlab/sherlock/location_spec.rb b/spec/lib/gitlab/sherlock/location_spec.rb
index 7b40c84c2d1..4a8b5dffba2 100644
--- a/spec/lib/gitlab/sherlock/location_spec.rb
+++ b/spec/lib/gitlab/sherlock/location_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Sherlock::Location do
+RSpec.describe Gitlab::Sherlock::Location do
   let(:location) { described_class.new(__FILE__, 1) }
 
   describe 'from_ruby_location' do
diff --git a/spec/lib/gitlab/sherlock/middleware_spec.rb b/spec/lib/gitlab/sherlock/middleware_spec.rb
index 8d6e362f622..645bde6681d 100644
--- a/spec/lib/gitlab/sherlock/middleware_spec.rb
+++ b/spec/lib/gitlab/sherlock/middleware_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Sherlock::Middleware do
+RSpec.describe Gitlab::Sherlock::Middleware do
   let(:app) { double(:app) }
   let(:middleware) { described_class.new(app) }
 
diff --git a/spec/lib/gitlab/sherlock/query_spec.rb b/spec/lib/gitlab/sherlock/query_spec.rb
index 13c7e6f8f8b..b8dfd082c37 100644
--- a/spec/lib/gitlab/sherlock/query_spec.rb
+++ b/spec/lib/gitlab/sherlock/query_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Sherlock::Query do
+RSpec.describe Gitlab::Sherlock::Query do
   let(:started_at)  { Time.utc(2015, 1, 1) }
   let(:finished_at) { started_at + 5 }
 
diff --git a/spec/lib/gitlab/sherlock/transaction_spec.rb b/spec/lib/gitlab/sherlock/transaction_spec.rb
index 728c44df4f3..535b0ad4d8a 100644
--- a/spec/lib/gitlab/sherlock/transaction_spec.rb
+++ b/spec/lib/gitlab/sherlock/transaction_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Sherlock::Transaction do
+RSpec.describe Gitlab::Sherlock::Transaction do
   let(:transaction) { described_class.new('POST', '/cat_pictures') }
 
   describe '#id' do