Merge branch 'release-3.4' RC4

3 files changed, 3 insertions, 3 deletions

diff --git a/api/context.go b/api/context.go
index 37b426c21..b63005d64 100644
--- a/api/context.go
+++ b/api/context.go
@@ -150,7 +150,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	w.Header().Set(model.HEADER_REQUEST_ID, c.RequestId)
-	w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v", model.CurrentVersion, utils.CfgHash))
+	w.Header().Set(model.HEADER_VERSION_ID, fmt.Sprintf("%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash))
 	if einterfaces.GetClusterInterface() != nil {
 		w.Header().Set(model.HEADER_CLUSTER_ID, einterfaces.GetClusterInterface().GetClusterId())
 	}
diff --git a/api/user.go b/api/user.go
index daa405ad4..a33e2f7d7 100644
--- a/api/user.go
+++ b/api/user.go
@@ -2156,7 +2156,7 @@ func emailToLdap(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	go sendSignInChangeEmail(c, user.Email, c.GetSiteURL(), "LDAP")
+	go sendSignInChangeEmail(c, user.Email, c.GetSiteURL(), "AD/LDAP")
 
 	m := map[string]string{}
 	m["follow_link"] = "/login?extra=signin_change"
diff --git a/api/web_hub.go b/api/web_hub.go
index c4abc5a7a..452fa10f8 100644
--- a/api/web_hub.go
+++ b/api/web_hub.go
@@ -64,7 +64,7 @@ func (h *Hub) Register(webConn *WebConn) {
 	h.register <- webConn
 
 	msg := model.NewWebSocketEvent("", "", webConn.UserId, model.WEBSOCKET_EVENT_HELLO)
-	msg.Add("server_version", fmt.Sprintf("%v.%v", model.CurrentVersion, utils.CfgHash))
+	msg.Add("server_version", fmt.Sprintf("%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash))
 	go Publish(msg)
 }