From 7dc16346bba174d6075cf438adcd70a5596ba935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 22 Mar 2016 19:19:53 +0100
Subject: Fix an issue causing the Dashboard/Milestones page to be blank
---
app/controllers/concerns/global_milestones.rb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'app/controllers/concerns')
diff --git a/app/controllers/concerns/global_milestones.rb b/app/controllers/concerns/global_milestones.rb
index 54ea1e454fc..f5eace47df4 100644
--- a/app/controllers/concerns/global_milestones.rb
+++ b/app/controllers/concerns/global_milestones.rb
@@ -6,7 +6,10 @@ module GlobalMilestones
@milestones = MilestonesFinder.new.execute(@projects, params)
@milestones = GlobalMilestone.build_collection(@milestones)
@milestones = @milestones.sort_by { |x| x.due_date.nil? ? epoch : x.due_date }
- @milestones = Kaminari.paginate_array(@milestones).page(params[:page])
+
+ if request.format == :html
+ @milestones = Kaminari.paginate_array(@milestones).page(params[:page])
+ end
end
def milestone
--
cgit v1.2.1