diff --git a/CHANGELOG b/CHANGELOG index e3a8c3731bfd9b3133c5187d40ed78b6f076f102..71ae0589948d06b93fd4d664db51822d2f8ecaef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) @@ -164,7 +165,6 @@ v 8.10.0 - Export and import avatar as part of project import/export - Fix migration corrupting import data for old version upgrades - Show tooltip on GitLab export link in new project page - - Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska) v 8.9.6 - Fix importing of events under notes for GitLab projects. !5154 diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 97610b1f962de0554274166a25419f71db20d739..c6826a09bd285cf5e9b543f425460a22ebf84c18 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -77,9 +77,8 @@ def send_artifacts_entry(build, entry) end def version - if File.readable?(File.join(Rails.root, VERSION_FILE)) - File.read(File.join(Rails.root, VERSION_FILE)) - end + path = Rails.root.join(VERSION_FILE) + path.readable? ? path.read.chomp : 'unknown' end protected