summaryrefslogtreecommitdiff
path: root/app/controllers/dashboard_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-09 13:26:54 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-09 13:26:54 -0800
commitaca0caa8cc1a6bd481f87dd810284e69d3747050 (patch)
tree381c171bfb4dbf7a85b01ad8a264e5bed647747e /app/controllers/dashboard_controller.rb
parentd27cc91ee92f4bd16e007984a7d131a218d2d5dc (diff)
parentd7bc1214748564604eb544c56dabb0b551737ae6 (diff)
downloadgitlab-ce-aca0caa8cc1a6bd481f87dd810284e69d3747050.tar.gz
Merge pull request #2534 from AlexDenisov/ajax_activities
Reload activities/events on the dashboard page via ajax
Diffstat (limited to 'app/controllers/dashboard_controller.rb')
-rw-r--r--app/controllers/dashboard_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 4bd840a07fb..c0ec4708e0a 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -60,6 +60,7 @@ class DashboardController < ApplicationController
end
def event_filter
- @event_filter ||= EventFilter.new(params[:event_filter])
+ filters = cookies['event_filter'].split(',') if cookies['event_filter']
+ @event_filter ||= EventFilter.new(filters)
end
end