From e3bd51e38d8f8ec0bd369e77cdbaf5311986a8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 21 Aug 2017 11:10:59 +0200 Subject: [PATCH 1/2] fix: remove duplicate set-cookie when logging in, fixes #9013 --- pkg/api/login.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/api/login.go b/pkg/api/login.go index a9fcbee8e8e..f31ea01b108 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -137,6 +137,8 @@ func loginUserWithUser(user *m.User, c *middleware.Context) { log.Error(3, "User login with nil user") } + c.Resp.Header().Del("Set-Cookie") + days := 86400 * setting.LogInRememberDays if days > 0 { c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/") From 7b5019482e5d221439179c75b0c1d25f87bd755f Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 21 Aug 2017 13:43:09 +0200 Subject: [PATCH 2/2] mysqlds: add placeholder/typeahead for localhost connection strings for the host field on the data source config page. Fixes #9046 --- public/app/plugins/datasource/mysql/partials/config.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/mysql/partials/config.html b/public/app/plugins/datasource/mysql/partials/config.html index cf153a125bf..870d3443908 100644 --- a/public/app/plugins/datasource/mysql/partials/config.html +++ b/public/app/plugins/datasource/mysql/partials/config.html @@ -4,7 +4,7 @@
Host - +