Add latest changes from gitlab-org/gitlab@master

39 files changed, 39 insertions, 39 deletions

diff --git a/spec/presenters/award_emoji_presenter_spec.rb b/spec/presenters/award_emoji_presenter_spec.rb
index e2ada2a3c93..58ee985f165 100644
--- a/spec/presenters/award_emoji_presenter_spec.rb
+++ b/spec/presenters/award_emoji_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AwardEmojiPresenter do
+RSpec.describe AwardEmojiPresenter do
   let(:emoji_name) { 'thumbsup' }
   let(:award_emoji) { build(:award_emoji, name: emoji_name) }
   let(:presenter) { described_class.new(award_emoji) }
diff --git a/spec/presenters/blob_presenter_spec.rb b/spec/presenters/blob_presenter_spec.rb
index ee7bfd1256d..bf926ce62b3 100644
--- a/spec/presenters/blob_presenter_spec.rb
+++ b/spec/presenters/blob_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BlobPresenter, :seed_helper do
+RSpec.describe BlobPresenter, :seed_helper do
   let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '', 'group/project') }
 
   let(:git_blob) do
diff --git a/spec/presenters/blobs/unfold_presenter_spec.rb b/spec/presenters/blobs/unfold_presenter_spec.rb
index 83004809536..4e9f83e8001 100644
--- a/spec/presenters/blobs/unfold_presenter_spec.rb
+++ b/spec/presenters/blobs/unfold_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Blobs::UnfoldPresenter do
+RSpec.describe Blobs::UnfoldPresenter do
   include FakeBlobHelpers
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/presenters/ci/bridge_presenter_spec.rb b/spec/presenters/ci/bridge_presenter_spec.rb
index 2a4c40a7eaa..6291c3426e2 100644
--- a/spec/presenters/ci/bridge_presenter_spec.rb
+++ b/spec/presenters/ci/bridge_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::BridgePresenter do
+RSpec.describe Ci::BridgePresenter do
   let_it_be(:project) { create(:project) }
   let_it_be(:pipeline) { create(:ci_pipeline, project: project) }
   let_it_be(:bridge) { create(:ci_bridge, pipeline: pipeline, status: :failed) }
diff --git a/spec/presenters/ci/build_presenter_spec.rb b/spec/presenters/ci/build_presenter_spec.rb
index 9cf6eb45c63..8d302b242b3 100644
--- a/spec/presenters/ci/build_presenter_spec.rb
+++ b/spec/presenters/ci/build_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::BuildPresenter do
+RSpec.describe Ci::BuildPresenter do
   let(:project) { create(:project) }
   let(:pipeline) { create(:ci_pipeline, project: project) }
   let(:build) { create(:ci_build, pipeline: pipeline) }
diff --git a/spec/presenters/ci/build_runner_presenter_spec.rb b/spec/presenters/ci/build_runner_presenter_spec.rb
index de199d2bff9..ce4c5a2db7d 100644
--- a/spec/presenters/ci/build_runner_presenter_spec.rb
+++ b/spec/presenters/ci/build_runner_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::BuildRunnerPresenter do
+RSpec.describe Ci::BuildRunnerPresenter do
   let(:presenter) { described_class.new(build) }
   let(:archive) { { paths: ['sample.txt'] } }
 
diff --git a/spec/presenters/ci/group_variable_presenter_spec.rb b/spec/presenters/ci/group_variable_presenter_spec.rb
index 3b81a425f5b..aaa6410266e 100644
--- a/spec/presenters/ci/group_variable_presenter_spec.rb
+++ b/spec/presenters/ci/group_variable_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::GroupVariablePresenter do
+RSpec.describe Ci::GroupVariablePresenter do
   include Gitlab::Routing.url_helpers
 
   let(:group) { create(:group) }
diff --git a/spec/presenters/ci/legacy_stage_presenter_spec.rb b/spec/presenters/ci/legacy_stage_presenter_spec.rb
index ccf4e48de6e..5268ef0f246 100644
--- a/spec/presenters/ci/legacy_stage_presenter_spec.rb
+++ b/spec/presenters/ci/legacy_stage_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::LegacyStagePresenter do
+RSpec.describe Ci::LegacyStagePresenter do
   let(:legacy_stage) { create(:ci_stage) }
   let(:presenter) { described_class.new(legacy_stage) }
 
diff --git a/spec/presenters/ci/pipeline_presenter_spec.rb b/spec/presenters/ci/pipeline_presenter_spec.rb
index e8b66682b97..158daad97f5 100644
--- a/spec/presenters/ci/pipeline_presenter_spec.rb
+++ b/spec/presenters/ci/pipeline_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::PipelinePresenter do
+RSpec.describe Ci::PipelinePresenter do
   include Gitlab::Routing
 
   let(:user) { create(:user) }
diff --git a/spec/presenters/ci/trigger_presenter_spec.rb b/spec/presenters/ci/trigger_presenter_spec.rb
index 41cb436f928..bac1c94e0b7 100644
--- a/spec/presenters/ci/trigger_presenter_spec.rb
+++ b/spec/presenters/ci/trigger_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::TriggerPresenter do
+RSpec.describe Ci::TriggerPresenter do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
 
diff --git a/spec/presenters/ci/variable_presenter_spec.rb b/spec/presenters/ci/variable_presenter_spec.rb
index 70cf2f539b6..30fedf78035 100644
--- a/spec/presenters/ci/variable_presenter_spec.rb
+++ b/spec/presenters/ci/variable_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::VariablePresenter do
+RSpec.describe Ci::VariablePresenter do
   include Gitlab::Routing.url_helpers
 
   let(:project) { create(:project) }
diff --git a/spec/presenters/clusterable_presenter_spec.rb b/spec/presenters/clusterable_presenter_spec.rb
index 2c0a7f3e9b2..d19abd4e4d8 100644
--- a/spec/presenters/clusterable_presenter_spec.rb
+++ b/spec/presenters/clusterable_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ClusterablePresenter do
+RSpec.describe ClusterablePresenter do
   include Gitlab::Routing.url_helpers
 
   describe '.fabricate' do
diff --git a/spec/presenters/clusters/cluster_presenter_spec.rb b/spec/presenters/clusters/cluster_presenter_spec.rb
index 6a1360807b7..ff9963c3ad1 100644
--- a/spec/presenters/clusters/cluster_presenter_spec.rb
+++ b/spec/presenters/clusters/cluster_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Clusters::ClusterPresenter do
+RSpec.describe Clusters::ClusterPresenter do
   include Gitlab::Routing.url_helpers
 
   let(:cluster) { create(:cluster, :provided_by_gcp, :project) }
diff --git a/spec/presenters/commit_presenter_spec.rb b/spec/presenters/commit_presenter_spec.rb
index bc749acfa3a..bc6be07f415 100644
--- a/spec/presenters/commit_presenter_spec.rb
+++ b/spec/presenters/commit_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CommitPresenter do
+RSpec.describe CommitPresenter do
   let(:project) { create(:project, :repository) }
   let(:commit) { project.commit }
   let(:user) { create(:user) }
diff --git a/spec/presenters/commit_status_presenter_spec.rb b/spec/presenters/commit_status_presenter_spec.rb
index b02497d4c11..4b2441d656e 100644
--- a/spec/presenters/commit_status_presenter_spec.rb
+++ b/spec/presenters/commit_status_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CommitStatusPresenter do
+RSpec.describe CommitStatusPresenter do
   let(:project) { create(:project) }
   let(:pipeline) { create(:ci_pipeline, project: project) }
   let(:build) { create(:ci_build, pipeline: pipeline) }
diff --git a/spec/presenters/dev_ops_score/metric_presenter_spec.rb b/spec/presenters/dev_ops_score/metric_presenter_spec.rb
index b6eab3f2e74..8b7b2c88578 100644
--- a/spec/presenters/dev_ops_score/metric_presenter_spec.rb
+++ b/spec/presenters/dev_ops_score/metric_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DevOpsScore::MetricPresenter do
+RSpec.describe DevOpsScore::MetricPresenter do
   subject { described_class.new(metric) }
 
   let(:metric) { build(:dev_ops_score_metric) }
diff --git a/spec/presenters/event_presenter_spec.rb b/spec/presenters/event_presenter_spec.rb
index eb94d838370..2d4872ea29e 100644
--- a/spec/presenters/event_presenter_spec.rb
+++ b/spec/presenters/event_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EventPresenter do
+RSpec.describe EventPresenter do
   include Gitlab::Routing.url_helpers
 
   let_it_be(:group) { create(:group) }
diff --git a/spec/presenters/group_clusterable_presenter_spec.rb b/spec/presenters/group_clusterable_presenter_spec.rb
index d40ca856f7b..3910f4705c5 100644
--- a/spec/presenters/group_clusterable_presenter_spec.rb
+++ b/spec/presenters/group_clusterable_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupClusterablePresenter do
+RSpec.describe GroupClusterablePresenter do
   include Gitlab::Routing.url_helpers
 
   let(:presenter) { described_class.new(group) }
diff --git a/spec/presenters/group_member_presenter_spec.rb b/spec/presenters/group_member_presenter_spec.rb
index 382b1881ab7..6bd3005fbb6 100644
--- a/spec/presenters/group_member_presenter_spec.rb
+++ b/spec/presenters/group_member_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupMemberPresenter do
+RSpec.describe GroupMemberPresenter do
   let(:user) { double(:user) }
   let(:group) { double(:group) }
   let(:group_member) { double(:group_member, source: group) }
diff --git a/spec/presenters/instance_clusterable_presenter_spec.rb b/spec/presenters/instance_clusterable_presenter_spec.rb
index 4265e2fcb69..352b7fc6ea7 100644
--- a/spec/presenters/instance_clusterable_presenter_spec.rb
+++ b/spec/presenters/instance_clusterable_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InstanceClusterablePresenter do
+RSpec.describe InstanceClusterablePresenter do
   include Gitlab::Routing.url_helpers
 
   let(:presenter) { described_class.new(instance) }
diff --git a/spec/presenters/issue_presenter_spec.rb b/spec/presenters/issue_presenter_spec.rb
index 4a4caef9d28..f08cd0f2026 100644
--- a/spec/presenters/issue_presenter_spec.rb
+++ b/spec/presenters/issue_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuePresenter do
+RSpec.describe IssuePresenter do
   include Gitlab::Routing.url_helpers
 
   let(:user)      { create(:user) }
diff --git a/spec/presenters/label_presenter_spec.rb b/spec/presenters/label_presenter_spec.rb
index 9578d017af5..cb6e991bd8e 100644
--- a/spec/presenters/label_presenter_spec.rb
+++ b/spec/presenters/label_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LabelPresenter do
+RSpec.describe LabelPresenter do
   include Gitlab::Routing.url_helpers
 
   let_it_be(:group) { create(:group) }
diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb
index f184e767f8c..e7184d23767 100644
--- a/spec/presenters/merge_request_presenter_spec.rb
+++ b/spec/presenters/merge_request_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MergeRequestPresenter do
+RSpec.describe MergeRequestPresenter do
   let(:resource) { create(:merge_request, source_project: project) }
   let(:project) { create(:project) }
   let(:user) { create(:user) }
diff --git a/spec/presenters/milestone_presenter_spec.rb b/spec/presenters/milestone_presenter_spec.rb
index 3d7b3ad6d78..1f23bb31fda 100644
--- a/spec/presenters/milestone_presenter_spec.rb
+++ b/spec/presenters/milestone_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MilestonePresenter do
+RSpec.describe MilestonePresenter do
   let_it_be(:user) { create(:user) }
   let_it_be(:group) { create(:group) }
   let_it_be(:milestone) { create(:milestone, group: group) }
diff --git a/spec/presenters/pages_domain_presenter_spec.rb b/spec/presenters/pages_domain_presenter_spec.rb
index 30ce59b7bfb..731279ce5b9 100644
--- a/spec/presenters/pages_domain_presenter_spec.rb
+++ b/spec/presenters/pages_domain_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PagesDomainPresenter do
+RSpec.describe PagesDomainPresenter do
   using RSpec::Parameterized::TableSyntax
   include LetsEncryptHelpers
 
diff --git a/spec/presenters/project_clusterable_presenter_spec.rb b/spec/presenters/project_clusterable_presenter_spec.rb
index b3dad4abde5..6cd06670595 100644
--- a/spec/presenters/project_clusterable_presenter_spec.rb
+++ b/spec/presenters/project_clusterable_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectClusterablePresenter do
+RSpec.describe ProjectClusterablePresenter do
   include Gitlab::Routing.url_helpers
 
   let(:presenter) { described_class.new(project) }
diff --git a/spec/presenters/project_hook_presenter_spec.rb b/spec/presenters/project_hook_presenter_spec.rb
index 773e8ccf51e..061ec38ae34 100644
--- a/spec/presenters/project_hook_presenter_spec.rb
+++ b/spec/presenters/project_hook_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectHookPresenter do
+RSpec.describe ProjectHookPresenter do
   let(:web_hook_log) { create(:web_hook_log) }
   let(:project) { web_hook_log.web_hook.project }
   let(:web_hook) { web_hook_log.web_hook }
diff --git a/spec/presenters/project_member_presenter_spec.rb b/spec/presenters/project_member_presenter_spec.rb
index 743c89fc7c2..ad45a23c183 100644
--- a/spec/presenters/project_member_presenter_spec.rb
+++ b/spec/presenters/project_member_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectMemberPresenter do
+RSpec.describe ProjectMemberPresenter do
   let(:user) { double(:user) }
   let(:project) { double(:project) }
   let(:project_member) { double(:project_member, source: project) }
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index 65ae85ea78f..eb1ff628d14 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectPresenter do
+RSpec.describe ProjectPresenter do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:presenter) { described_class.new(project, current_user: user) }
diff --git a/spec/presenters/projects/import_export/project_export_presenter_spec.rb b/spec/presenters/projects/import_export/project_export_presenter_spec.rb
index 052ca36974a..8463d01d95b 100644
--- a/spec/presenters/projects/import_export/project_export_presenter_spec.rb
+++ b/spec/presenters/projects/import_export/project_export_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ImportExport::ProjectExportPresenter do
+RSpec.describe Projects::ImportExport::ProjectExportPresenter do
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }
   let_it_be(:user) { create(:user) }
diff --git a/spec/presenters/projects/prometheus/alert_presenter_spec.rb b/spec/presenters/projects/prometheus/alert_presenter_spec.rb
index 8ee5a4d7b3f..e558c651734 100644
--- a/spec/presenters/projects/prometheus/alert_presenter_spec.rb
+++ b/spec/presenters/projects/prometheus/alert_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Prometheus::AlertPresenter do
+RSpec.describe Projects::Prometheus::AlertPresenter do
   let_it_be(:project, reload: true) { create(:project) }
 
   let(:presenter) { described_class.new(alert) }
diff --git a/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb b/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb
index b9cb60e414f..7a679a03b53 100644
--- a/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb
+++ b/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Settings::DeployKeysPresenter do
+RSpec.describe Projects::Settings::DeployKeysPresenter do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
diff --git a/spec/presenters/release_presenter_spec.rb b/spec/presenters/release_presenter_spec.rb
index 57de99f6a61..5577b3ad2e8 100644
--- a/spec/presenters/release_presenter_spec.rb
+++ b/spec/presenters/release_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ReleasePresenter do
+RSpec.describe ReleasePresenter do
   include Gitlab::Routing.url_helpers
 
   let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/presenters/sentry_error_presenter_spec.rb b/spec/presenters/sentry_error_presenter_spec.rb
index 5f3f1d33b86..af9e7c8a2b2 100644
--- a/spec/presenters/sentry_error_presenter_spec.rb
+++ b/spec/presenters/sentry_error_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SentryErrorPresenter do
+RSpec.describe SentryErrorPresenter do
   let(:error) { build(:detailed_error_tracking_error) }
   let(:presenter) { described_class.new(error) }
 
diff --git a/spec/presenters/service_hook_presenter_spec.rb b/spec/presenters/service_hook_presenter_spec.rb
index bea57768e3e..adef34a882b 100644
--- a/spec/presenters/service_hook_presenter_spec.rb
+++ b/spec/presenters/service_hook_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ServiceHookPresenter do
+RSpec.describe ServiceHookPresenter do
   let(:web_hook_log) { create(:web_hook_log, web_hook: service_hook) }
   let(:service_hook) { create(:service_hook, service: service) }
   let(:service) { create(:drone_ci_service, project: project) }
diff --git a/spec/presenters/snippet_blob_presenter_spec.rb b/spec/presenters/snippet_blob_presenter_spec.rb
index eb7621cc591..28c86468c78 100644
--- a/spec/presenters/snippet_blob_presenter_spec.rb
+++ b/spec/presenters/snippet_blob_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SnippetBlobPresenter do
+RSpec.describe SnippetBlobPresenter do
   describe '#rich_data' do
     before do
       allow_next_instance_of(described_class) do |instance|
diff --git a/spec/presenters/snippet_presenter_spec.rb b/spec/presenters/snippet_presenter_spec.rb
index 423e9edc219..98c291bdd02 100644
--- a/spec/presenters/snippet_presenter_spec.rb
+++ b/spec/presenters/snippet_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SnippetPresenter do
+RSpec.describe SnippetPresenter do
   include Gitlab::Routing.url_helpers
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/presenters/tree_entry_presenter_spec.rb b/spec/presenters/tree_entry_presenter_spec.rb
index 0c29fe3e5ff..d29a7a6ab04 100644
--- a/spec/presenters/tree_entry_presenter_spec.rb
+++ b/spec/presenters/tree_entry_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TreeEntryPresenter do
+RSpec.describe TreeEntryPresenter do
   include Gitlab::Routing.url_helpers
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/presenters/web_hook_log_presenter_spec.rb b/spec/presenters/web_hook_log_presenter_spec.rb
index 8812a0ba594..68c8c6e2a1b 100644
--- a/spec/presenters/web_hook_log_presenter_spec.rb
+++ b/spec/presenters/web_hook_log_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe WebHookLogPresenter do
+RSpec.describe WebHookLogPresenter do
   include Gitlab::Routing.url_helpers
 
   describe '#details_path' do