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

4 files changed, 4 insertions, 4 deletions

diff --git a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb
index 864529a6bf6..5b69b34d04b 100644
--- a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb
+++ b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 # For easier debugging set `PUMA_DEBUG=1`
 
-describe Gitlab::Cluster::Mixins::PumaCluster do
+RSpec.describe Gitlab::Cluster::Mixins::PumaCluster do
   before do
     stub_const('PUMA_STARTUP_TIMEOUT', 30)
   end
diff --git a/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb b/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb
index 3965eb722a0..0aaca0a79c2 100644
--- a/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb
+++ b/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 # For easier debugging set `UNICORN_DEBUG=1`
 
-describe Gitlab::Cluster::Mixins::UnicornHttpServer do
+RSpec.describe Gitlab::Cluster::Mixins::UnicornHttpServer do
   before do
     stub_const('UNICORN_STARTUP_TIMEOUT', 30)
   end
diff --git a/spec/lib/gitlab/cluster/puma_worker_killer_observer_spec.rb b/spec/lib/gitlab/cluster/puma_worker_killer_observer_spec.rb
index 6ed9dda08d7..948de161235 100644
--- a/spec/lib/gitlab/cluster/puma_worker_killer_observer_spec.rb
+++ b/spec/lib/gitlab/cluster/puma_worker_killer_observer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Cluster::PumaWorkerKillerObserver do
+RSpec.describe Gitlab::Cluster::PumaWorkerKillerObserver do
   let(:counter) { Gitlab::Metrics::NullMetric.instance }
 
   before do
diff --git a/spec/lib/gitlab/cluster/rack_timeout_observer_spec.rb b/spec/lib/gitlab/cluster/rack_timeout_observer_spec.rb
index 68e5435450c..05df4089075 100644
--- a/spec/lib/gitlab/cluster/rack_timeout_observer_spec.rb
+++ b/spec/lib/gitlab/cluster/rack_timeout_observer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Cluster::RackTimeoutObserver do
+RSpec.describe Gitlab::Cluster::RackTimeoutObserver do
   let(:counter) { Gitlab::Metrics::NullMetric.instance }
 
   before do