summaryrefslogtreecommitdiff
path: root/spec/controllers/dashboard
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-04 03:08:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-04 03:08:05 +0000
commit640e72ca920642c86eeef05e6b4e6ebeb66e6ddf (patch)
treee252371209c01cf88560e0fa19e4e288e9b13361 /spec/controllers/dashboard
parent340fd2966e6565a549f8e611b25d2525fc6929d1 (diff)
downloadgitlab-ce-640e72ca920642c86eeef05e6b4e6ebeb66e6ddf.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/dashboard')
-rw-r--r--spec/controllers/dashboard/groups_controller_spec.rb2
-rw-r--r--spec/controllers/dashboard/labels_controller_spec.rb2
-rw-r--r--spec/controllers/dashboard/milestones_controller_spec.rb2
-rw-r--r--spec/controllers/dashboard/projects_controller_spec.rb2
-rw-r--r--spec/controllers/dashboard/snippets_controller_spec.rb2
-rw-r--r--spec/controllers/dashboard/todos_controller_spec.rb2
6 files changed, 6 insertions, 6 deletions
diff --git a/spec/controllers/dashboard/groups_controller_spec.rb b/spec/controllers/dashboard/groups_controller_spec.rb
index b615bcc1e6b..f246d7bcaf1 100644
--- a/spec/controllers/dashboard/groups_controller_spec.rb
+++ b/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) }
diff --git a/spec/controllers/dashboard/labels_controller_spec.rb b/spec/controllers/dashboard/labels_controller_spec.rb
index cb9c3660b9b..415cb821545 100644
--- a/spec/controllers/dashboard/labels_controller_spec.rb
+++ b/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) }
diff --git a/spec/controllers/dashboard/milestones_controller_spec.rb b/spec/controllers/dashboard/milestones_controller_spec.rb
index 36c1e2d7169..899aa7a41c1 100644
--- a/spec/controllers/dashboard/milestones_controller_spec.rb
+++ b/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) }
diff --git a/spec/controllers/dashboard/projects_controller_spec.rb b/spec/controllers/dashboard/projects_controller_spec.rb
index eeac696c3f2..ee043fde0ff 100644
--- a/spec/controllers/dashboard/projects_controller_spec.rb
+++ b/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
diff --git a/spec/controllers/dashboard/snippets_controller_spec.rb b/spec/controllers/dashboard/snippets_controller_spec.rb
index d5e3a348cd2..3c316d07408 100644
--- a/spec/controllers/dashboard/snippets_controller_spec.rb
+++ b/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
diff --git a/spec/controllers/dashboard/todos_controller_spec.rb b/spec/controllers/dashboard/todos_controller_spec.rb
index 004eef1873e..f0aa351bee0 100644
--- a/spec/controllers/dashboard/todos_controller_spec.rb
+++ b/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) }