Commit 63f39602 authored by Douwe Maan's avatar Douwe Maan 🌴

Merge branch 'add-gitlab-workhorse-version-to-admin-dashboard' into 'master'

Add gitlab-workhorse version to admin dashboard

## What does this MR do?
Add gitlab-workhorse version to admin dashboard.

## What are the relevant issue numbers?
Closes #15418 

## Screenshot

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG]( entry added
- Tests
  - [x] Add test - show Gitlab Workhorse version on Admin Dashboard
  - [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)

cc @ubudzisz @yorickpeterse @grzesiek [@chastell]( [@tomash](

See merge request !5321
parents 8d684d8f ab419b08
Pipeline #3772635 passed with stages
in 1493 minutes and 39 seconds
......@@ -5,6 +5,7 @@ v 8.11.0 (unreleased)
- Limit git rev-list output count to one in forced push check
- Retrieve rendered HTML from cache in one request
- Load project invited groups and members eagerly in ProjectTeam#fetch_members
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
v 8.10.0
- Fix profile activity heatmap to show correct day name (eanplatter)
......@@ -79,6 +79,10 @@
GitLab Shell
GitLab Workhorse
= Gitlab::Workhorse.version
GitLab API
......@@ -4,6 +4,7 @@ require 'json'
module Gitlab
class Workhorse
SEND_DATA_HEADER = 'Gitlab-Workhorse-Send-Data'
class << self
def git_http_ok(repository, user)
......@@ -75,6 +76,11 @@ module Gitlab
def version
path = Rails.root.join(VERSION_FILE)
path.readable? ? : 'unknown'
def encode(hash)
require 'spec_helper'
describe 'admin/dashboard/index.html.haml' do
include Devise::TestHelpers
before do
assign(:projects, create_list(:empty_project, 1))
assign(:users, create_list(:user, 1))
assign(:groups, create_list(:group, 1))
allow(view).to receive(:admin?).and_return(true)
it "shows version of GitLab Workhorse" do
expect(rendered).to have_content 'GitLab Workhorse'
expect(rendered).to have_content Gitlab::Workhorse.version
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment