Add latest changes from gitlab-org/gitlab@master

8 files changed, 8 insertions, 8 deletions

diff --git a/spec/features/issuables/close_reopen_report_toggle_spec.rb b/spec/features/issuables/close_reopen_report_toggle_spec.rb
index 8805018902f..cf3028ec4c9 100644
--- a/spec/features/issuables/close_reopen_report_toggle_spec.rb
+++ b/spec/features/issuables/close_reopen_report_toggle_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issuables Close/Reopen/Report toggle' do
+RSpec.describe 'Issuables Close/Reopen/Report toggle' do
   let(:user) { create(:user) }
 
   shared_examples 'an issuable close/reopen/report toggle' do
diff --git a/spec/features/issuables/discussion_lock_spec.rb b/spec/features/issuables/discussion_lock_spec.rb
index 0cd2c077081..13f1742fbf6 100644
--- a/spec/features/issuables/discussion_lock_spec.rb
+++ b/spec/features/issuables/discussion_lock_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Discussion Lock', :js do
+RSpec.describe 'Discussion Lock', :js do
   let(:user) { create(:user) }
   let(:issue) { create(:issue, project: project, author: user) }
   let(:project) { create(:project, :public) }
diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb
index 7014a51ccdc..382a7a9321c 100644
--- a/spec/features/issuables/issuable_list_spec.rb
+++ b/spec/features/issuables/issuable_list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'issuable list' do
+RSpec.describe 'issuable list' do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
 
diff --git a/spec/features/issuables/markdown_references/internal_references_spec.rb b/spec/features/issuables/markdown_references/internal_references_spec.rb
index efd84cf67b0..aceaea8d2ed 100644
--- a/spec/features/issuables/markdown_references/internal_references_spec.rb
+++ b/spec/features/issuables/markdown_references/internal_references_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Internal references", :js do
+RSpec.describe "Internal references", :js do
   include Spec::Support::Helpers::Features::NotesHelpers
 
   let(:private_project_user) { private_project.owner }
diff --git a/spec/features/issuables/markdown_references/jira_spec.rb b/spec/features/issuables/markdown_references/jira_spec.rb
index 779606effdc..a3a259e21a1 100644
--- a/spec/features/issuables/markdown_references/jira_spec.rb
+++ b/spec/features/issuables/markdown_references/jira_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Jira", :js do
+RSpec.describe "Jira", :js do
   let(:user) { create(:user) }
   let(:actual_project) { create(:project, :public, :repository) }
   let(:merge_request) { create(:merge_request, target_project: actual_project, source_project: actual_project) }
diff --git a/spec/features/issuables/shortcuts_issuable_spec.rb b/spec/features/issuables/shortcuts_issuable_spec.rb
index da8a0dd7b0f..78cd8d0bef3 100644
--- a/spec/features/issuables/shortcuts_issuable_spec.rb
+++ b/spec/features/issuables/shortcuts_issuable_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Blob shortcuts', :js do
+RSpec.describe 'Blob shortcuts', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
   let(:issue) { create(:issue, project: project, author: user) }
diff --git a/spec/features/issuables/sorting_list_spec.rb b/spec/features/issuables/sorting_list_spec.rb
index b7813c8ba30..59518723740 100644
--- a/spec/features/issuables/sorting_list_spec.rb
+++ b/spec/features/issuables/sorting_list_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'Sort Issuable List' do
+RSpec.describe 'Sort Issuable List' do
   let(:project) { create(:project, :public) }
 
   let(:first_created_issuable) { issuables.order_created_asc.first }
diff --git a/spec/features/issuables/user_sees_sidebar_spec.rb b/spec/features/issuables/user_sees_sidebar_spec.rb
index 52040eb8cbb..04bf704b6a4 100644
--- a/spec/features/issuables/user_sees_sidebar_spec.rb
+++ b/spec/features/issuables/user_sees_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Sidebar on Mobile' do
+RSpec.describe 'Issue Sidebar on Mobile' do
   include MobileHelpers
 
   let(:project) { create(:project, :public, :repository) }