diff --git a/lib/discourse.rb b/lib/discourse.rb index 7badcc01d51..e7d1a19d890 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -201,6 +201,16 @@ module Discourse end end + def self.git_branch + return $git_branch if $git_branch + + begin + $git_branch ||= `git rev-parse --abbrev-ref HEAD`.strip + rescue + $git_branch = "unknown" + end + end + # Either returns the site_contact_username user or the first admin. def self.site_contact_user user = User.find_by(username_lower: SiteSetting.site_contact_username.downcase) if SiteSetting.site_contact_username.present? diff --git a/lib/discourse_hub.rb b/lib/discourse_hub.rb index e8eafdef24e..4309647b020 100644 --- a/lib/discourse_hub.rb +++ b/lib/discourse_hub.rb @@ -6,10 +6,9 @@ module DiscourseHub def self.version_check_payload { installed_version: Discourse::VERSION::STRING - } + }.merge!( Discourse.git_branch == "unknown" ? {} : {branch: Discourse.git_branch}) end - def self.discourse_version_check get('/version_check', version_check_payload) end