From 18236171ebc398c157f2e61b15c7df9f91205284 Mon Sep 17 00:00:00 2001
From: Adam Cooke <adam@krystal.io>
Date: Wed, 20 Mar 2024 14:30:32 +0000
Subject: [PATCH] chore(ui): display branch in footer if present

---
 app/helpers/application_helper.rb       |  7 +++++++
 app/views/layouts/application.html.haml |  4 +++-
 lib/postal/config.rb                    | 12 ++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0e54e0d..c6acf45 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -100,4 +100,11 @@ module ApplicationHelper
     end.html_safe
   end
 
+  def postal_version_string
+    string = Postal.version
+    string += " (#{Postal.branch})" if Postal.branch &&
+                                       Postal.branch != "main"
+    string
+  end
+
 end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 7176ef4..c7411f9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -55,6 +55,8 @@
         %footer.siteContent__footer
           %ul.footer__links
             %li.footer__name
-              Powered by #{link_to "Postal", "https://postalserver.io", target: '_blank'} #{Postal.version}.
+              Powered by
+              #{link_to "Postal", "https://postalserver.io", target: '_blank'}
+              #{postal_version_string}
             %li= link_to "Documentation", "https://docs.postalserver.io", target: '_blank'
             %li= link_to "Ask for help", "https://discussions.postalserver.io", target: '_blank'
diff --git a/lib/postal/config.rb b/lib/postal/config.rb
index b2717f6..dd0eebf 100644
--- a/lib/postal/config.rb
+++ b/lib/postal/config.rb
@@ -153,6 +153,18 @@ module Postal
       ActiveRecord::Base.establish_connection(config.merge(pool: new_size))
     end
 
+    # Return the branch name which created this release
+    #
+    # @return [String, nil]
+    def branch
+      return @branch if instance_variable_defined?("@branch")
+
+      @branch = begin
+        path = Rails.root.join("BRANCH")
+        File.read(path).strip if File.exist?(path)
+      end
+    end
+
   end
 
   Config = initialize_config