summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Miller <travis@travismiller.com>2017-09-04 15:52:00 -0500
committerTravis Miller <travis@travismiller.com>2017-09-07 22:02:57 -0500
commit88568317a8829a50a22c1151b9580c0d8fe60c1f (patch)
tree8da7fa2d654aba166a8d3ca1095364879c658fe5
parentb39d0c318921bae2e3a11df9ee6828291dad9864 (diff)
downloadgitlab-ce-88568317a8829a50a22c1151b9580c0d8fe60c1f.tar.gz
Add GitLab-Pages version to Admin Dashboard
-rw-r--r--app/views/admin/dashboard/index.html.haml5
-rw-r--r--changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml5
-rw-r--r--lib/gitlab/pages.rb5
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