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/views/help | |
| 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/views/help')
| -rw-r--r-- | app/views/help/index.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index af39dfeac5b..bf4b7234b21 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -3,6 +3,8 @@ GitLab %span= Gitlab::VERSION %small= Gitlab::REVISION + - if current_application_settings.version_check_enabled + = version_status_badge %p.slead GitLab is open source software to collaborate on code. %br |