From 6b75320f525f841454f1ab162d141d3610f2e77b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 17 Oct 2019 12:07:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/application_settings_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/helpers/application_settings_helper.rb') diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 3c70ff3b59f..115d1031a8a 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -290,7 +290,8 @@ module ApplicationSettingsHelper :snowplow_cookie_domain, :snowplow_enabled, :snowplow_site_id, - :push_event_hooks_limit + :push_event_hooks_limit, + :push_event_activities_limit ] end -- cgit v1.2.1