summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-09 00:09:09 -0400
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-13 16:10:49 -0400
commit42e0625dfb2a791affd592df1f879083702e6f86 (patch)
tree328494558d9c9b6a38d576534ed94164f2778a31 /app/controllers
parent1617d1e0267f389e040772bfed0dd29e34b25c06 (diff)
downloadgitlab-ce-42e0625dfb2a791affd592df1f879083702e6f86.tar.gz
Filter by multiple labels with little animation.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/issues_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index c26cfeccf1d..8ce6772c400 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -33,14 +33,15 @@ class Projects::IssuesController < Projects::ApplicationController
end
@issues = @issues.page(params[:page])
- @label = @project.labels.find_by(title: params[:label_name])
+ @labels = @project.labels.where(title: params[:label_name])
respond_to do |format|
format.html
format.atom { render layout: false }
format.json do
render json: {
- html: view_to_html_string("projects/issues/_issues")
+ html: view_to_html_string("projects/issues/_issues"),
+ labels: @labels
}
end
end