CE upstream (!850) · Merge requests · GitLab.org / GitLab · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Merged Valery Sizov requested to merge ce_upstream into master 8 years ago

Viewing commit e934043d

Show latest version

4 files

+ 35

− 1

Files

4

e934043d

Merge branch '21664-incorrect-workhorse-version-number-displayed' into 'master' · e934043d

Rémy Coutable authored 8 years ago

Use the Gitlab Workhorse HTTP header in the admin dashboard

Fixes issue #21664 where the GitLab Workhorse version displayed within the Admin Area was not correct for installations from source.

See merge request !7332

app/helpers/components_helper.rb 0 → 100644

+ 9

− 0

module ComponentsHelper
  def gitlab_workhorse_version
    if request.headers['Gitlab-Workhorse'].present?
      request.headers['Gitlab-Workhorse'].split('-').first
    else
      Gitlab::Workhorse.version
    end
  end
end