diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-07 06:09:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-07 06:09:49 +0300 |
| commit | fc5ff4728b3937c8a505aa06f9cfe5b2da672b03 (patch) | |
| tree | 2f2d7036d8b76b5a62d47b24c1db006594df0ca6 /app/helpers/application_settings_helper.rb | |
| parent | d5f6f9fbcdeb231e03c24b56aaf736580ac40eb2 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 67cfed0b015..f50b3297e7e 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -198,6 +198,7 @@ module ApplicationSettingsHelper :default_project_visibility, :default_projects_limit, :default_snippet_visibility, + :disable_feed_token, :disabled_oauth_sign_in_sources, :domain_denylist, :domain_denylist_enabled, |