diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-12 10:16:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-12 10:16:01 +0000 |
| commit | c36eeffbe8b034c3cd761d2eafc6989e56b3de6a (patch) | |
| tree | 7a81c9dc7b9e218324d008354f1c4693e40324d9 | |
| parent | 2602cc0c36966ba366db8393786e9164e95a188c (diff) | |
| parent | 88568317a8829a50a22c1151b9580c0d8fe60c1f (diff) | |
| download | gitlab-ce-c36eeffbe8b034c3cd761d2eafc6989e56b3de6a.tar.gz | |
Merge branch '36953-add-gitLab-pages-version-to-admin-dashboard' into 'master'
Add GitLab-Pages version to Admin Dashboard
Closes #36953
See merge request !14040
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/pages.rb | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 069f8f89e0b..703f4165128 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -111,6 +111,11 @@ GitLab API %span.pull-right = API::API::version + - if Gitlab.config.pages.enabled + %p + GitLab Pages + %span.pull-right + = Gitlab::Pages::VERSION %p Git %span.pull-right diff --git a/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml b/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml new file mode 100644 index 00000000000..680ef0cef92 --- /dev/null +++ b/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml @@ -0,0 +1,5 @@ +--- +title: Add GitLab-Pages version to Admin Dashboard +merge_request: 14040 +author: @travismiller +type: added diff --git a/lib/gitlab/pages.rb b/lib/gitlab/pages.rb new file mode 100644 index 00000000000..981ef8faa9a --- /dev/null +++ b/lib/gitlab/pages.rb @@ -0,0 +1,5 @@ +module Gitlab + module Pages + VERSION = File.read(Rails.root.join("GITLAB_PAGES_VERSION")).strip.freeze + end +end |