diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-17 16:14:17 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-17 16:14:17 +0100 |
| commit | 2fd334b86a33cd96c7708980e1f9cd7f8717877a (patch) | |
| tree | 0ebe85c6ae6d85c035556e9052e308ea20189540 /app/controllers/groups | |
| parent | bd47118e1b5a814b7660b8b2d808690ca971871e (diff) | |
| download | gitlab-ce-2fd334b86a33cd96c7708980e1f9cd7f8717877a.tar.gz | |
Fix group labels list
Diffstat (limited to 'app/controllers/groups')
| -rw-r--r-- | app/controllers/groups/labels_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb index 596dd5b2d69..0570edb51c2 100644 --- a/app/controllers/groups/labels_controller.rb +++ b/app/controllers/groups/labels_controller.rb @@ -9,11 +9,11 @@ class Groups::LabelsController < Groups::ApplicationController respond_to :html def index - @prioritized_labels = @available_labels.prioritized(@group) - @labels = @available_labels.unprioritized(@group).page(params[:page]) + @labels = @group.labels.page(params[:page]) respond_to do |format| - format.html + format.html do + end format.json do render json: LabelSerializer.new.represent_appearance(@available_labels) end |