summaryrefslogtreecommitdiff
path: root/app/helpers/labels_helper.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-16 09:41:55 +0100
committerPhil Hughes <me@iamphill.com>2016-07-20 10:48:02 +0100
commit9a1feb65cc1e947e16dc29308fbc02a1deee56f5 (patch)
treea8596c7037bada0cc2ddc112ea7b099af271fd20 /app/helpers/labels_helper.rb
parent3582861cbcb3e4c80822408c6c31d0de48720813 (diff)
downloadgitlab-ce-9a1feb65cc1e947e16dc29308fbc02a1deee56f5.tar.gz
Fixed labels & milestones loading the wrong path
Diffstat (limited to 'app/helpers/labels_helper.rb')
-rw-r--r--app/helpers/labels_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 5e9f5837101..5acfae753b9 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -115,8 +115,9 @@ module LabelsHelper
end
def labels_filter_path
+ project = @target_project || @project
if @project
- namespace_project_labels_path(@project.namespace, @project, :json)
+ namespace_project_labels_path(project.namespace, project, :json)
else
dashboard_labels_path(:json)
end