Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master

2019-03-11 13:10:45 +01:00
parent 90a3bc2203 946e542412
commit 647cb6ddae
6 changed files with 7 additions and 1 deletions
@@ -36,6 +36,7 @@ func (hs *HTTPServer) LoginView(c *m.ReqContext) {
 	viewData.Settings["oauth"] = enabledOAuths
 	viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp
 	viewData.Settings["loginHint"] = setting.LoginHint
+	viewData.Settings["passwordHint"] = setting.PasswordHint
 	viewData.Settings["disableLoginForm"] = setting.DisableLoginForm

 	if loginError, ok := tryGetEncryptedCookie(c, LoginErrorCookieName); ok {