diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-10 12:51:46 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-10 12:51:46 -0700 |
| commit | 100d750bc5ec4c6c5be11eb6f4100fe38b4ddee7 (patch) | |
| tree | 3339d7451f13ba1e6cb4a7362c08e68424d4a32d /app | |
| parent | 73179685b0517dcdebe696b5987b47822b9bf6ed (diff) | |
| download | gitlab-ce-100d750bc5ec4c6c5be11eb6f4100fe38b4ddee7.tar.gz | |
Add feature to disable version check
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 6 | ||||
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 5 | ||||
| -rw-r--r-- | app/views/help/index.html.haml | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 2b0c500e97a..5973af71267 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -28,7 +28,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :gravatar_enabled, :twitter_sharing_enabled, :sign_in_text, - :home_page_url + :home_page_url, + :version_check_enabled ) end end diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index ac64d26f9aa..cab5688a499 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -24,6 +24,12 @@ .col-sm-10 = f.check_box :twitter_sharing_enabled, class: 'checkbox form-control', :'aria-describedby' => 'twitter_help_block' %span.help-block#twitter_help_block Show users a button to share their newly created public or internal projects on twitter + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :version_check_enabled do + = f.check_box :version_check_enabled + Version check enabled %fieldset %legend Misc .form-group diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 6b4ff4b330d..3732ff847b9 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -58,8 +58,9 @@ .col-md-4 %h4 Components - .pull-right - = version_status_badge + - if current_application_settings.version_check_enabled + .pull-right + = version_status_badge %hr %p diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index e2276260189..bf4b7234b21 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -3,7 +3,8 @@ GitLab %span= Gitlab::VERSION %small= Gitlab::REVISION - = version_status_badge + - if current_application_settings.version_check_enabled + = version_status_badge %p.slead GitLab is open source software to collaborate on code. %br |