diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 06:08:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 06:08:57 +0300 |
| commit | 852f4a85dd199751e4652748461163de85ecda53 (patch) | |
| tree | b4160aa19c23582b5ab5ac02f9860b5498007c43 /app/helpers/application_settings_helper.rb | |
| parent | 82cd20acf9f4cceecf222abe718a9e23cef55687 (diff) | |
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index f96c26b428c..222a6898726 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -315,7 +315,9 @@ module ApplicationSettingsHelper :push_event_hooks_limit, :push_event_activities_limit, :custom_http_clone_url_root, - :snippet_size_limit + :snippet_size_limit, + :email_restrictions_enabled, + :email_restrictions ] end |