diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-08 10:49:30 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-08 10:49:30 -0500 |
| commit | 5955caed321e242bfebe52a4b47346a01a50e4f6 (patch) | |
| tree | d9710c0732ce21801b4a79a281bec0bd39582a95 /app/helpers/application_settings_helper.rb | |
| parent | f9e2b4730f58ba630344c9554eb907ab003abbd5 (diff) | |
| parent | 533593e95cd3a922a2ec2ea43b345862361dfd67 (diff) | |
| download | gitlab-ce-5955caed321e242bfebe52a4b47346a01a50e4f6.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 3fbb32c5229..b948e431882 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -248,7 +248,10 @@ module ApplicationSettingsHelper :user_default_external, :user_oauth_applications, :version_check_enabled, - :allow_local_requests_from_hooks_and_services + :allow_local_requests_from_hooks_and_services, + :enforce_terms, + :terms, + :mirror_available ] end end |