summaryrefslogtreecommitdiff
path: root/app/controllers/dashboard/projects_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-11 06:10:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-11 06:10:03 +0000
commit7adadf7e5b83c46f7e83051146624719e9b6bf0d (patch)
tree3439c6c97d3345ce9ce4e972e39c57eef5dc2d64 /app/controllers/dashboard/projects_controller.rb
parentfb8d6a526f0ef2da9fb247e15f9ff19279dba3d6 (diff)
downloadgitlab-ce-7adadf7e5b83c46f7e83051146624719e9b6bf0d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/dashboard/projects_controller.rb')
-rw-r--r--app/controllers/dashboard/projects_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 7cb39625371..01bb930a51b 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -36,7 +36,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
# rubocop: disable CodeReuse/ActiveRecord
def starred
@projects = load_projects(params.merge(starred: true))
- .includes(:forked_from_project, :tags)
+ .includes(:forked_from_project, :topics)
@groups = []