Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-09-20 17:55:31 +0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 19:58:24 +0300
commitb10e5764ac0765b556d64dfebb9dad948154e31a (patch)
tree20dfe3bf8920b97383313daa8e43bd57c31fa8a4 /app/controllers/groups/labels_controller.rb
parentbaf47a0bd0e0563cbc99b3ae4b1336b8b3b4380a (diff)
List only labels that belongs to the group on the group issues page
Diffstat (limited to 'app/controllers/groups/labels_controller.rb')
-rw-r--r--app/controllers/groups/labels_controller.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb
index 0ec2fcda0ef..0ebdee55c79 100644
--- a/app/controllers/groups/labels_controller.rb
+++ b/app/controllers/groups/labels_controller.rb
@@ -8,7 +8,15 @@ class Groups::LabelsController < Groups::ApplicationController
respond_to :html
def index
- @labels = @group.labels.page(params[:page])
+ respond_to do |format|
+ format.html do
+ @labels = @group.labels.page(params[:page])
+ end
+
+ format.json do
+ render json: LabelsFinder.new(current_user, group_id: @group.id).execute
+ end
+ end
end
def new