summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-09-20 11:55:31 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 14:58:24 -0200
commitb10e5764ac0765b556d64dfebb9dad948154e31a (patch)
tree20dfe3bf8920b97383313daa8e43bd57c31fa8a4 /app/helpers
parentbaf47a0bd0e0563cbc99b3ae4b1336b8b3b4380a (diff)
downloadgitlab-ce-b10e5764ac0765b556d64dfebb9dad948154e31a.tar.gz
List only labels that belongs to the group on the group issues page
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/labels_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 9df8d37af9e..8e5321c05fa 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -172,7 +172,10 @@ module LabelsHelper
end
def labels_filter_path
+ return group_labels_path(@group, :json) if @group
+
project = @target_project || @project
+
if project
namespace_project_labels_path(project.namespace, project, :json)
else