Add latest changes from gitlab-org/gitlab@master

7 files changed, 8 insertions, 8 deletions

diff --git a/spec/features/milestones/user_creates_milestone_spec.rb b/spec/features/milestones/user_creates_milestone_spec.rb
index 12cb27b0062..d80796b8f9a 100644
--- a/spec/features/milestones/user_creates_milestone_spec.rb
+++ b/spec/features/milestones/user_creates_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User creates milestone", :js do
+RSpec.describe "User creates milestone", :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
 
diff --git a/spec/features/milestones/user_deletes_milestone_spec.rb b/spec/features/milestones/user_deletes_milestone_spec.rb
index fd72f2dfefa..ede9faed876 100644
--- a/spec/features/milestones/user_deletes_milestone_spec.rb
+++ b/spec/features/milestones/user_deletes_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User deletes milestone", :js do
+RSpec.describe "User deletes milestone", :js do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
diff --git a/spec/features/milestones/user_edits_milestone_spec.rb b/spec/features/milestones/user_edits_milestone_spec.rb
index be05685aff7..3edd50922b6 100644
--- a/spec/features/milestones/user_edits_milestone_spec.rb
+++ b/spec/features/milestones/user_edits_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User edits milestone", :js do
+RSpec.describe "User edits milestone", :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:milestone) { create(:milestone, project: project, start_date: Date.today, due_date: 5.days.from_now) }
diff --git a/spec/features/milestones/user_promotes_milestone_spec.rb b/spec/features/milestones/user_promotes_milestone_spec.rb
index d14097e1ef4..a9c3c9706a0 100644
--- a/spec/features/milestones/user_promotes_milestone_spec.rb
+++ b/spec/features/milestones/user_promotes_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User promotes milestone' do
+RSpec.describe 'User promotes milestone' do
   let_it_be(:group) { create(:group) }
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, namespace: group) }
diff --git a/spec/features/milestones/user_sees_breadcrumb_links_spec.rb b/spec/features/milestones/user_sees_breadcrumb_links_spec.rb
index 92445735328..e9cfa9b20dc 100644
--- a/spec/features/milestones/user_sees_breadcrumb_links_spec.rb
+++ b/spec/features/milestones/user_sees_breadcrumb_links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New project milestone breadcrumb' do
+RSpec.describe 'New project milestone breadcrumb' do
   let(:project) { create(:project) }
   let(:milestone) { create(:milestone, project: project) }
   let(:user) { project.creator }
diff --git a/spec/features/milestones/user_views_milestone_spec.rb b/spec/features/milestones/user_views_milestone_spec.rb
index ca13e226432..420f8d49483 100644
--- a/spec/features/milestones/user_views_milestone_spec.rb
+++ b/spec/features/milestones/user_views_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User views milestone" do
+RSpec.describe "User views milestone" do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:milestone) { create(:milestone, project: project) }
diff --git a/spec/features/milestones/user_views_milestones_spec.rb b/spec/features/milestones/user_views_milestones_spec.rb
index e17797a8165..3f606577121 100644
--- a/spec/features/milestones/user_views_milestones_spec.rb
+++ b/spec/features/milestones/user_views_milestones_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User views milestones" do
+RSpec.describe "User views milestones" do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:milestone) { create(:milestone, project: project) }
@@ -65,7 +65,7 @@ describe "User views milestones" do
   end
 end
 
-describe "User views milestones with no MR" do
+RSpec.describe "User views milestones with no MR" do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :merge_requests_disabled) }
   let_it_be(:milestone) { create(:milestone, project: project) }