summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorIgor Kapkov <igasgeek@me.com>2017-08-07 22:56:24 +1000
committerRémy Coutable <remy@rymai.me>2018-09-26 18:34:26 +0200
commit65cf805278c1d865ee0543508de92d5f4ecae4f0 (patch)
tree791622408c28e66ce4b2876227ae056024db235e /app
parent4586d77c85647063675108b0dcdcfebed0c890ca (diff)
downloadgitlab-ce-65cf805278c1d865ee0543508de92d5f4ecae4f0.tar.gz
Allow events filter to be set in the URL in addition to cookie
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fb2808edf47..81b538b97ba 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -275,6 +275,7 @@ class ApplicationController < ActionController::Base
def event_filter
# Split using comma to maintain backward compatibility Ex/ "filter1,filter2"
filters = cookies['event_filter'].split(',')[0] if cookies['event_filter'].present?
+ filters = params[:event_filter].split(',')[0] if params[:event_filter].present?
@event_filter ||= EventFilter.new(filters)
end