diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 16:05:00 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 16:05:00 +0300 |
| commit | c3cf32e863b47d98d6e1d2d3ed78745ddf2ccb79 (patch) | |
| tree | ee9eaaeabf247a882701100e5dbac36120c80a8a /app/controllers/admin/application_settings_controller.rb | |
| parent | 6c32abc5f7f090d4932054e5cc1ff0594edd5ff1 (diff) | |
| parent | edf0a0715b56a50fd1ac8ac505333f7e6fa4384c (diff) | |
| download | gitlab-ce-c3cf32e863b47d98d6e1d2d3ed78745ddf2ccb79.tar.gz | |
Merge branch 'version-check' into gl-version-check
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/views/admin/application_settings/_form.html.haml
db/schema.rb
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
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..03fd12e9ecd 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -43,6 +43,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :default_snippet_visibility, :restricted_signup_domains_raw, restricted_visibility_levels: [], + :version_check_enabled ) end end |