Merge pull request #699 from mattermost/PLT-92

PLT-92 Adding server side versioning to the binary

1 files changed, 7 insertions, 2 deletions

diff --git a/utils/config.go b/utils/config.go
index 0eb8329d1..6fd3a9ca7 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -11,6 +11,8 @@ import (
 	"strconv"
 
 	l4g "code.google.com/p/log4go"
+
+	"github.com/mattermost/platform/model"
 )
 
 const (
@@ -26,7 +28,6 @@ type ServiceSettings struct {
 	AllowTesting               bool
 	UseSSL                     bool
 	Port                       string
-	Version                    string
 	InviteSalt                 string
 	PublicLinkSalt             string
 	ResetSalt                  string
@@ -275,7 +276,11 @@ func getSanitizeOptions(c *Config) map[string]bool {
 func getClientProperties(c *Config) map[string]string {
 	props := make(map[string]string)
 
-	props["Version"] = c.ServiceSettings.Version
+	props["Version"] = model.CurrentVersion
+	props["BuildNumber"] = model.BuildNumber
+	props["BuildDate"] = model.BuildDate
+	props["BuildHash"] = model.BuildHash
+
 	props["SiteName"] = c.ServiceSettings.SiteName
 	props["ByPassEmail"] = strconv.FormatBool(c.EmailSettings.ByPassEmail)
 	props["FeedbackEmail"] = c.EmailSettings.FeedbackEmail