diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
| commit | 6b75320f525f841454f1ab162d141d3610f2e77b (patch) | |
| tree | 4971c27759e4fbc18b85e71800c3b9c12346317e /app/helpers/application_settings_helper.rb | |
| parent | 4226aca420920c1844e8eade4798a2dff188a6fc (diff) | |
| download | gitlab-ce-6b75320f525f841454f1ab162d141d3610f2e77b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |