summaryrefslogtreecommitdiff
path: root/app/controllers/admin/application_settings_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-05-13 11:17:16 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-05-13 11:17:16 +0000
commitf32a045ef41688859732abfcdc2a2030387be78f (patch)
tree883efa6fcf7d0eac100d7c07132400e1bcdfd4c3 /app/controllers/admin/application_settings_controller.rb
parentcb8f974b2126122ad22fd01301c576f14c69ed01 (diff)
parent0928c3ae04c8e708753705746e9eb74c62001dad (diff)
downloadgitlab-ce-f32a045ef41688859732abfcdc2a2030387be78f.tar.gz
Merge branch 'version-check' into 'master'
Version check See merge request !1509
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
-rw-r--r--app/controllers/admin/application_settings_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 3975e30835e..4c35622fff1 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -42,6 +42,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:default_project_visibility,
:default_snippet_visibility,
:restricted_signup_domains_raw,
+ :version_check_enabled,
restricted_visibility_levels: [],
)
end