Add latest changes from gitlab-org/gitlab@master

8 files changed, 8 insertions, 8 deletions

diff --git a/spec/lib/system_check/app/authorized_keys_permission_check_spec.rb b/spec/lib/system_check/app/authorized_keys_permission_check_spec.rb
index 1a8123c3f0a..a5a3105c125 100644
--- a/spec/lib/system_check/app/authorized_keys_permission_check_spec.rb
+++ b/spec/lib/system_check/app/authorized_keys_permission_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SystemCheck::App::AuthorizedKeysPermissionCheck do
+RSpec.describe SystemCheck::App::AuthorizedKeysPermissionCheck do
   subject(:system_check) { described_class.new }
 
   describe '#skip?' do
diff --git a/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb b/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb
index f132f608ab6..2c996635c36 100644
--- a/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb
+++ b/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SystemCheck::App::GitUserDefaultSSHConfigCheck do
+RSpec.describe SystemCheck::App::GitUserDefaultSSHConfigCheck do
   let(:username) { '_this_user_will_not_exist_unless_it_is_stubbed' }
   let(:base_dir) { Dir.mktmpdir }
   let(:home_dir) { File.join(base_dir, "/var/lib/#{username}") }
diff --git a/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb b/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb
index e5e7f6a4450..14bf9d61ab5 100644
--- a/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb
+++ b/spec/lib/system_check/app/hashed_storage_all_projects_check_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake_helper'
 
-describe SystemCheck::App::HashedStorageAllProjectsCheck do
+RSpec.describe SystemCheck::App::HashedStorageAllProjectsCheck do
   before do
     silence_output
   end
diff --git a/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb b/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb
index d5a0014b791..32a2f409858 100644
--- a/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb
+++ b/spec/lib/system_check/app/hashed_storage_enabled_check_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake_helper'
 
-describe SystemCheck::App::HashedStorageEnabledCheck do
+RSpec.describe SystemCheck::App::HashedStorageEnabledCheck do
   before do
     silence_output
   end
diff --git a/spec/lib/system_check/base_check_spec.rb b/spec/lib/system_check/base_check_spec.rb
index ccb7b483bdc..59b2fc519ae 100644
--- a/spec/lib/system_check/base_check_spec.rb
+++ b/spec/lib/system_check/base_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SystemCheck::BaseCheck do
+RSpec.describe SystemCheck::BaseCheck do
   context 'helpers on instance level' do
     it 'responds to SystemCheck::Helpers methods' do
       expect(subject).to respond_to :fix_and_rerun, :for_more_information, :see_installation_guide_section,
diff --git a/spec/lib/system_check/orphans/namespace_check_spec.rb b/spec/lib/system_check/orphans/namespace_check_spec.rb
index f7491e40438..795dfde9029 100644
--- a/spec/lib/system_check/orphans/namespace_check_spec.rb
+++ b/spec/lib/system_check/orphans/namespace_check_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake_helper'
 
-describe SystemCheck::Orphans::NamespaceCheck do
+RSpec.describe SystemCheck::Orphans::NamespaceCheck do
   let(:storages) { Gitlab.config.repositories.storages.reject { |key, _| key.eql? 'broken' } }
 
   before do
diff --git a/spec/lib/system_check/orphans/repository_check_spec.rb b/spec/lib/system_check/orphans/repository_check_spec.rb
index a5e06f30e75..2ab30f4802d 100644
--- a/spec/lib/system_check/orphans/repository_check_spec.rb
+++ b/spec/lib/system_check/orphans/repository_check_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake_helper'
 
-describe SystemCheck::Orphans::RepositoryCheck do
+RSpec.describe SystemCheck::Orphans::RepositoryCheck do
   let(:storages) { Gitlab.config.repositories.storages.reject { |key, _| key.eql? 'broken' } }
 
   before do
diff --git a/spec/lib/system_check/simple_executor_spec.rb b/spec/lib/system_check/simple_executor_spec.rb
index 58f3a7df197..c9a09d86e32 100644
--- a/spec/lib/system_check/simple_executor_spec.rb
+++ b/spec/lib/system_check/simple_executor_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake_helper'
 
-describe SystemCheck::SimpleExecutor do
+RSpec.describe SystemCheck::SimpleExecutor do
   before do
     stub_const('SimpleCheck', Class.new(SystemCheck::BaseCheck))
     stub_const('OtherCheck', Class.new(SystemCheck::BaseCheck))