Add latest changes from gitlab-org/gitlab@master

doc/administration/monitoring/github_imports.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Monitoring GitHub imports
 
 >**Note:**

doc/administration/monitoring/gitlab_self_monitoring_project/index.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # GitLab self monitoring project
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32351) in GitLab 12.7, behind a disabled feature flag (`self_monitoring_project`).

doc/administration/monitoring/index.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Monitoring GitLab
 
 Explore our features to monitor your GitLab instance:

doc/administration/monitoring/ip_whitelist.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # IP whitelist
 
 > Introduced in GitLab 9.4.

doc/administration/monitoring/performance/gitlab_configuration.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # GitLab Configuration
 
 GitLab Performance Monitoring is disabled by default. To enable it and change any of its

doc/administration/monitoring/performance/grafana_configuration.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Grafana Configuration
 
 [Grafana](https://grafana.com/) is a tool that allows you to visualize time

doc/administration/monitoring/performance/index.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # GitLab Performance Monitoring
 
 GitLab comes with its own application performance measuring system as of GitLab

doc/administration/monitoring/performance/performance_bar.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Performance Bar
 
 A Performance Bar can be displayed, to dig into the performance of a page. When

doc/administration/monitoring/performance/request_profiling.md

@@ -1,3 +1,9 @@
+---
+stage: Monitor
+group: APM
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+---
+
 # Request Profiling
 
 ## Procedure

doc/ci/jenkins/index.md

@@ -124,7 +124,7 @@ There are some important differences in the way Runners work in comparison to ag
   associate runners with specific jobs. For example, you can use a tag for jobs that
   require dedicated, more powerful, or specific hardware.
 - GitLab has [autoscaling for Runners](https://docs.gitlab.com/runner/configuration/autoscale.html)
-  which will let configure them to be provisioned as needed, and scaled down when not.
+  which will let you configure them to be provisioned as needed, and scaled down when not.
   This is similar to ephemeral agents in Jenkins.
 
 If you are using `gitlab.com`, you can take advantage of our [shared Runner fleet](../../user/gitlab_com/index.md#shared-runners)

doc/user/group/contribution_analytics/index.md

@@ -63,7 +63,7 @@ Contributions per group member are also presented in tabular format. Click a col
 - Number of opened issues
 - Number of closed issues
 - Number of opened MRs
-- Number of accepted MRs
+- Number of merged MRs
 - Number of total contributions
 
 ![Contribution analytics contributions table](img/group_stats_table.png)

locale/gitlab.pot

@@ -1033,9 +1033,6 @@ msgstr ""
 msgid "Acceptable for use in this project"
 msgstr ""
 
-msgid "Accepted MR"
-msgstr ""
-
 msgid "Access Tokens"
 msgstr ""
 
@@ -6124,10 +6121,10 @@ msgstr ""
 msgid "Contribution Analytics"
 msgstr ""
 
-msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{accepted_count}</strong> accepted."
+msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed."
 msgstr ""
 
-msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed."
+msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{merged_count}</strong> merged."
 msgstr ""
 
 msgid "ContributionAnalytics|<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors."
@@ -13734,6 +13731,9 @@ msgstr ""
 msgid "Merged"
 msgstr ""
 
+msgid "Merged MRs"
+msgstr ""
+
 msgid "Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes."
 msgstr ""
 
@@ -15215,7 +15215,7 @@ msgstr ""
 msgid "Opened"
 msgstr ""
 
-msgid "Opened MR"
+msgid "Opened MRs"
 msgstr ""
 
 msgid "Opened issues"

spec/bin/changelog_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 load File.expand_path('../../bin/changelog', __dir__)
 
-describe 'bin/changelog' do
+RSpec.describe 'bin/changelog' do
   let(:options) { OpenStruct.new(title: 'Test title', type: 'fixed', dry_run: true) }
 
   describe ChangelogEntry do

spec/bin/sidekiq_cluster_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'shellwords'
 
-describe 'bin/sidekiq-cluster' do
+RSpec.describe 'bin/sidekiq-cluster' do
   using RSpec::Parameterized::TableSyntax
 
   context 'when selecting some queues and excluding others' do

spec/channels/application_cable/connection_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
+RSpec.describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
   let(:session_id) { Rack::Session::SessionId.new('6919a6f1bb119dd7396fadc38fd18d0d') }
 
   before do

spec/channels/issues_channel_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuesChannel do
+RSpec.describe IssuesChannel do
   let_it_be(:issue) { create(:issue) }
 
   it 'rejects when project path is invalid' do

spec/config/application_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Application do # rubocop:disable RSpec/FilePath
+RSpec.describe Gitlab::Application do # rubocop:disable RSpec/FilePath
   using RSpec::Parameterized::TableSyntax
 
   filtered_param = ActiveSupport::ParameterFilter::FILTERED

spec/config/mail_room_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'mail_room.yml' do
+RSpec.describe 'mail_room.yml' do
   include StubENV
 
   let(:mailroom_config_path) { 'config/mail_room.yml' }

spec/config/object_store_settings_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('config', 'object_store_settings.rb')
 
-describe ObjectStoreSettings do
+RSpec.describe ObjectStoreSettings do
   describe '.parse' do
     it 'sets correct default values' do
       settings = described_class.parse(nil)

spec/config/settings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Settings do
+RSpec.describe Settings do
   describe 'omniauth' do
     it 'defaults to enabled' do
       expect(described_class.omniauth.enabled).to be true

spec/config/smime_signature_settings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SmimeSignatureSettings do
+RSpec.describe SmimeSignatureSettings do
   describe '.parse' do
     let(:default_smime_key) { Rails.root.join('.gitlab_smime_key') }
     let(:default_smime_cert) { Rails.root.join('.gitlab_smime_cert') }

spec/controllers/abuse_reports_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AbuseReportsController do
+RSpec.describe AbuseReportsController do
   let(:reporter) { create(:user) }
   let(:user)     { create(:user) }
   let(:attrs) do

spec/controllers/acme_challenges_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AcmeChallengesController do
+RSpec.describe AcmeChallengesController do
   describe '#show' do
     let!(:acme_order) { create(:pages_domain_acme_order) }
 

spec/controllers/admin/appearances_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::AppearancesController do
+RSpec.describe Admin::AppearancesController do
   let(:admin) { create(:admin) }
   let(:header_message) { 'Header message' }
   let(:footer_message) { 'Footer' }

spec/controllers/admin/application_settings_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ApplicationSettingsController do
+RSpec.describe Admin::ApplicationSettingsController do
   include StubENV
   include UsageDataHelpers
 

spec/controllers/admin/applications_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ApplicationsController do
+RSpec.describe Admin::ApplicationsController do
   let(:admin) { create(:admin) }
   let(:application) { create(:oauth_application, owner_id: nil, owner_type: nil) }
 

spec/controllers/admin/ci/variables_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Ci::VariablesController do
+RSpec.describe Admin::Ci::VariablesController do
   let_it_be(:variable) { create(:ci_instance_variable) }
 
   before do

spec/controllers/admin/clusters/applications_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Clusters::ApplicationsController do
+RSpec.describe Admin::Clusters::ApplicationsController do
   include AccessMatchersForController
 
   def current_application

spec/controllers/admin/clusters_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ClustersController do
+RSpec.describe Admin::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
 

spec/controllers/admin/dashboard_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::DashboardController do
+RSpec.describe Admin::DashboardController do
   describe '#index' do
     context 'with pending_delete projects' do
       render_views

spec/controllers/admin/gitaly_servers_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::GitalyServersController do
+RSpec.describe Admin::GitalyServersController do
   describe '#index' do
     before do
       sign_in(create(:admin))

spec/controllers/admin/groups_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::GroupsController do
+RSpec.describe Admin::GroupsController do
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
   let(:admin) { create(:admin) }

spec/controllers/admin/health_check_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::HealthCheckController do
+RSpec.describe Admin::HealthCheckController do
   let(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/hooks_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::HooksController do
+RSpec.describe Admin::HooksController do
   let(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/identities_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::IdentitiesController do
+RSpec.describe Admin::IdentitiesController do
   let(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/impersonations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ImpersonationsController do
+RSpec.describe Admin::ImpersonationsController do
   let(:impersonator) { create(:admin) }
   let(:user) { create(:user) }
 

spec/controllers/admin/integrations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::IntegrationsController do
+RSpec.describe Admin::IntegrationsController do
   let(:admin) { create(:admin) }
   let(:integration) { create(:jira_service, :instance) }
 

spec/controllers/admin/projects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ProjectsController do
+RSpec.describe Admin::ProjectsController do
   let!(:project) { create(:project, :public) }
 
   before do

spec/controllers/admin/requests_profiles_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::RequestsProfilesController do
+RSpec.describe Admin::RequestsProfilesController do
   let_it_be(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/runners_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::RunnersController do
+RSpec.describe Admin::RunnersController do
   let_it_be(:runner) { create(:ci_runner) }
 
   before do

spec/controllers/admin/serverless/domains_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Serverless::DomainsController do
+RSpec.describe Admin::Serverless::DomainsController do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
 

spec/controllers/admin/services_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ServicesController do
+RSpec.describe Admin::ServicesController do
   let(:admin) { create(:admin) }
 
   before do

spec/controllers/admin/sessions_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SessionsController, :do_not_mock_admin_mode do
+RSpec.describe Admin::SessionsController, :do_not_mock_admin_mode do
   include_context 'custom session'
 
   let(:user) { create(:user) }

spec/controllers/admin/spam_logs_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SpamLogsController do
+RSpec.describe Admin::SpamLogsController do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
   let!(:first_spam) { create(:spam_log, user: user) }

spec/controllers/admin/users_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::UsersController do
+RSpec.describe Admin::UsersController do
   let(:user) { create(:user) }
 
   let_it_be(:admin) { create(:admin) }

spec/controllers/application_controller_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe ApplicationController do
+RSpec.describe ApplicationController do
   include TermsHelper
 
   let(:user) { create(:user) }

spec/controllers/autocomplete_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AutocompleteController do
+RSpec.describe AutocompleteController do
   let(:project) { create(:project) }
   let(:user) { project.owner }
 

spec/controllers/boards/issues_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Boards::IssuesController do
+RSpec.describe Boards::IssuesController do
   include ExternalAuthorizationServiceHelpers
 
   let(:project) { create(:project, :private) }

spec/controllers/boards/lists_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Boards::ListsController do
+RSpec.describe Boards::ListsController do
   let(:project) { create(:project) }
   let(:board)   { create(:board, project: project) }
   let(:user)    { create(:user) }

spec/controllers/chaos_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ChaosController do
+RSpec.describe ChaosController do
   describe '#leakmem' do
     it 'calls synchronously' do
       expect(Gitlab::Chaos).to receive(:leak_mem).with(100, 30.seconds)

spec/controllers/concerns/boards_responses_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BoardsResponses do
+RSpec.describe BoardsResponses do
   let(:controller_class) do
     Class.new do
       include BoardsResponses

spec/controllers/concerns/checks_collaboration_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ChecksCollaboration do
+RSpec.describe ChecksCollaboration do
   include ProjectForksHelper
 
   let(:helper) do

spec/controllers/concerns/confirm_email_warning_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ConfirmEmailWarning do
+RSpec.describe ConfirmEmailWarning do
   before do
     stub_feature_flags(soft_email_confirmation: true)
   end

spec/controllers/concerns/continue_params_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContinueParams do
+RSpec.describe ContinueParams do
   let(:controller_class) do
     Class.new(ActionController::Base) do
       include ContinueParams

spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ControllerWithCrossProjectAccessCheck do
+RSpec.describe ControllerWithCrossProjectAccessCheck do
   let(:user) { create(:user) }
 
   before do

spec/controllers/concerns/enforces_admin_authentication_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnforcesAdminAuthentication do
+RSpec.describe EnforcesAdminAuthentication do
   include AdminModeHelper
 
   let(:user) { create(:user) }

spec/controllers/concerns/group_tree_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupTree do
+RSpec.describe GroupTree do
   let(:group) { create(:group, :public) }
   let(:user) { create(:user) }
 

spec/controllers/concerns/import_url_params_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ImportUrlParams do
+RSpec.describe ImportUrlParams do
   let(:import_url_params) do
     controller = OpenStruct.new(params: params).extend(described_class)
     controller.import_url_params

spec/controllers/concerns/internal_redirect_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InternalRedirect do
+RSpec.describe InternalRedirect do
   let(:controller_class) do
     Class.new do
       include InternalRedirect

spec/controllers/concerns/issuable_actions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuableActions do
+RSpec.describe IssuableActions do
   let(:project) { double('project') }
   let(:user) { double('user') }
   let(:issuable) { double('issuable') }

spec/controllers/concerns/issuable_collections_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuableCollections do
+RSpec.describe IssuableCollections do
   let(:user) { create(:user) }
 
   let(:controller) do

spec/controllers/concerns/lfs_request_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LfsRequest do
+RSpec.describe LfsRequest do
   include ProjectForksHelper
 
   controller(Repositories::GitHttpClientController) do

spec/controllers/concerns/metrics_dashboard_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MetricsDashboard do
+RSpec.describe MetricsDashboard do
   include MetricsDashboardHelpers
 
   describe 'GET #metrics_dashboard' do

spec/controllers/concerns/page_limiter_spec.rb

@@ -14,7 +14,7 @@ class PageLimiterSpecController < ApplicationController
   end
 end
 
-describe PageLimiter do
+RSpec.describe PageLimiter do
   let(:controller_class) do
     PageLimiterSpecController
   end

spec/controllers/concerns/project_unauthorized_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectUnauthorized do
+RSpec.describe ProjectUnauthorized do
   include ExternalAuthorizationServiceHelpers
   let(:user) { create(:user) }
 

spec/controllers/concerns/redirects_for_missing_path_on_tree_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RedirectsForMissingPathOnTree, type: :controller do
+RSpec.describe RedirectsForMissingPathOnTree, type: :controller do
   controller(ActionController::Base) do
     include Gitlab::Routing.url_helpers
     include RedirectsForMissingPathOnTree

spec/controllers/concerns/renders_commits_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RendersCommits do
+RSpec.describe RendersCommits do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
   let_it_be(:user) { create(:user) }

spec/controllers/concerns/routable_actions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RoutableActions do
+RSpec.describe RoutableActions do
   controller(::ApplicationController) do
     include RoutableActions
 

spec/controllers/concerns/send_file_upload_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SendFileUpload do
+RSpec.describe SendFileUpload do
   let(:uploader_class) do
     Class.new(GitlabUploader) do
       include ObjectStorage::Concern

spec/controllers/concerns/sorting_preference_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SortingPreference do
+RSpec.describe SortingPreference do
   let(:user) { create(:user) }
 
   let(:controller_class) do

spec/controllers/concerns/sourcegraph_decorator_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SourcegraphDecorator do
+RSpec.describe SourcegraphDecorator do
   let_it_be(:enabled_user) { create(:user, sourcegraph_enabled: true) }
   let_it_be(:disabled_user) { create(:user, sourcegraph_enabled: false) }
   let_it_be(:public_project) { create(:project, :public) }

spec/controllers/concerns/static_object_external_storage_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StaticObjectExternalStorage do
+RSpec.describe StaticObjectExternalStorage do
   controller(Projects::ApplicationController) do
     include StaticObjectExternalStorage
 

spec/controllers/dashboard/groups_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::GroupsController do
+RSpec.describe Dashboard::GroupsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }

spec/controllers/dashboard/labels_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::LabelsController do
+RSpec.describe Dashboard::LabelsController do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
   let!(:label)  { create(:label, project: project) }

spec/controllers/dashboard/milestones_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::MilestonesController do
+RSpec.describe Dashboard::MilestonesController do
   let(:project) { create(:project) }
   let(:group) { create(:group) }
   let(:user) { create(:user) }

spec/controllers/dashboard/projects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::ProjectsController do
+RSpec.describe Dashboard::ProjectsController do
   include ExternalAuthorizationServiceHelpers
 
   describe '#index' do

spec/controllers/dashboard/snippets_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::SnippetsController do
+RSpec.describe Dashboard::SnippetsController do
   let(:user) { create(:user) }
 
   before do

spec/controllers/dashboard/todos_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::TodosController do
+RSpec.describe Dashboard::TodosController do
   let(:user) { create(:user) }
   let(:author)  { create(:user) }
   let(:project) { create(:project) }

spec/controllers/dashboard_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DashboardController do
+RSpec.describe DashboardController do
   context 'signed in' do
     let(:user) { create(:user) }
     let(:project) { create(:project) }

spec/controllers/explore/groups_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::GroupsController do
+RSpec.describe Explore::GroupsController do
   let(:user) { create(:user) }
 
   before do

spec/controllers/explore/projects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::ProjectsController do
+RSpec.describe Explore::ProjectsController do
   shared_examples 'explore projects' do
     describe 'GET #index.json' do
       render_views

spec/controllers/explore/snippets_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::SnippetsController do
+RSpec.describe Explore::SnippetsController do
   describe 'GET #index' do
     let!(:project_snippet) { create_list(:project_snippet, 3, :public) }
     let!(:personal_snippet) { create_list(:personal_snippet, 3, :public) }

spec/controllers/google_api/authorizations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GoogleApi::AuthorizationsController do
+RSpec.describe GoogleApi::AuthorizationsController do
   describe 'GET|POST #callback' do
     let(:user) { create(:user) }
     let(:token) { 'token' }

spec/controllers/graphql_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GraphqlController do
+RSpec.describe GraphqlController do
   include GraphqlHelpers
 
   before do

spec/controllers/groups/avatars_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::AvatarsController do
+RSpec.describe Groups::AvatarsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user)  { create(:user) }

spec/controllers/groups/boards_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::BoardsController do
+RSpec.describe Groups::BoardsController do
   let(:group) { create(:group) }
   let(:user)  { create(:user) }
 

spec/controllers/groups/children_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::ChildrenController do
+RSpec.describe Groups::ChildrenController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group, :public) }

spec/controllers/groups/clusters/applications_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Clusters::ApplicationsController do
+RSpec.describe Groups::Clusters::ApplicationsController do
   include AccessMatchersForController
 
   def current_application

spec/controllers/groups/clusters_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::ClustersController do
+RSpec.describe Groups::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
 

spec/controllers/groups/group_links_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::GroupLinksController do
+RSpec.describe Groups::GroupLinksController do
   let(:shared_with_group) { create(:group, :private) }
   let(:shared_group) { create(:group, :private) }
   let(:user) { create(:user) }

spec/controllers/groups/group_members_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::GroupMembersController do
+RSpec.describe Groups::GroupMembersController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }

spec/controllers/groups/labels_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::LabelsController do
+RSpec.describe Groups::LabelsController do
   let_it_be(:group) { create(:group) }
   let_it_be(:user)  { create(:user) }
   let_it_be(:project) { create(:project, namespace: group) }

spec/controllers/groups/milestones_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::MilestonesController do
+RSpec.describe Groups::MilestonesController do
   let(:group) { create(:group, :public) }
   let!(:project) { create(:project, :public, group: group) }
   let!(:project2) { create(:project, group: group) }

spec/controllers/groups/registry/repositories_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Registry::RepositoriesController do
+RSpec.describe Groups::Registry::RepositoriesController do
   let_it_be(:user)  { create(:user) }
   let_it_be(:guest) { create(:user) }
   let_it_be(:group, reload: true) { create(:group) }

spec/controllers/groups/runners_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::RunnersController do
+RSpec.describe Groups::RunnersController do
   let(:user)   { create(:user) }
   let(:group)  { create(:group) }
   let(:runner) { create(:ci_runner, :group, groups: [group]) }

spec/controllers/groups/settings/ci_cd_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::CiCdController do
+RSpec.describe Groups::Settings::CiCdController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group) }

spec/controllers/groups/settings/integrations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::IntegrationsController do
+RSpec.describe Groups::Settings::IntegrationsController do
   let_it_be(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:group) { create(:group) }

spec/controllers/groups/settings/repository_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::RepositoryController do
+RSpec.describe Groups::Settings::RepositoryController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group) }

spec/controllers/groups/shared_projects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::SharedProjectsController do
+RSpec.describe Groups::SharedProjectsController do
   def get_shared_projects(params = {})
     get :index, params: params.reverse_merge(format: :json, group_id: group.full_path)
   end