diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/controllers/dashboard | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/controllers/dashboard')
-rw-r--r-- | app/controllers/dashboard/groups_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/dashboard/labels_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/dashboard/milestones_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/dashboard/snippets_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/dashboard/todos_controller.rb | 2 |
6 files changed, 14 insertions, 2 deletions
diff --git a/app/controllers/dashboard/groups_controller.rb b/app/controllers/dashboard/groups_controller.rb index f82cde8e10a..23ffcd50369 100644 --- a/app/controllers/dashboard/groups_controller.rb +++ b/app/controllers/dashboard/groups_controller.rb @@ -5,6 +5,8 @@ class Dashboard::GroupsController < Dashboard::ApplicationController skip_cross_project_access_check :index + feature_category :subgroups + def index groups = GroupsFinder.new(current_user, all_available: false).execute render_group_tree(groups) diff --git a/app/controllers/dashboard/labels_controller.rb b/app/controllers/dashboard/labels_controller.rb index 89d87c2d5c8..b661efa12c0 100644 --- a/app/controllers/dashboard/labels_controller.rb +++ b/app/controllers/dashboard/labels_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class Dashboard::LabelsController < Dashboard::ApplicationController + feature_category :issue_tracking + def index respond_to do |format| format.json { render json: LabelSerializer.new.represent_appearance(labels) } @@ -9,8 +11,8 @@ class Dashboard::LabelsController < Dashboard::ApplicationController def labels finder_params = { project_ids: projects.select(:id) } - labels = LabelsFinder.new(current_user, finder_params).execute - GlobalLabel.build_collection(labels) + LabelsFinder.new(current_user, finder_params).execute + .select('DISTINCT ON (labels.title) labels.*') end end diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb index 14f9a026688..e17b16c26a2 100644 --- a/app/controllers/dashboard/milestones_controller.rb +++ b/app/controllers/dashboard/milestones_controller.rb @@ -4,6 +4,8 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController before_action :projects before_action :groups, only: :index + feature_category :issue_tracking + def index respond_to do |format| format.html do diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 2bd6fd85381..f7a74f40e4b 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -14,6 +14,8 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController before_action :projects, only: [:index] skip_cross_project_access_check :index, :starred + feature_category :projects + def index respond_to do |format| format.html do diff --git a/app/controllers/dashboard/snippets_controller.rb b/app/controllers/dashboard/snippets_controller.rb index a8ca3dbd0e7..6fe3d878639 100644 --- a/app/controllers/dashboard/snippets_controller.rb +++ b/app/controllers/dashboard/snippets_controller.rb @@ -7,6 +7,8 @@ class Dashboard::SnippetsController < Dashboard::ApplicationController skip_cross_project_access_check :index + feature_category :snippets + def index @snippet_counts = Snippets::CountService .new(current_user, author: current_user) diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb index 4fc2f7b0571..0ae326b5d94 100644 --- a/app/controllers/dashboard/todos_controller.rb +++ b/app/controllers/dashboard/todos_controller.rb @@ -9,6 +9,8 @@ class Dashboard::TodosController < Dashboard::ApplicationController before_action :authorize_read_group!, only: :index before_action :find_todos, only: [:index, :destroy_all] + feature_category :issue_tracking + def index @sort = params[:sort] @todos = @todos.page(params[:page]) |