fix(auth proxy): Fix for server side rendering of panel when using au…

…th proxy, fixes grafana#2568

.bra.toml

@@ -9,7 +9,11 @@ watch_dirs = [
 	"$WORKDIR/public/views",
 	"$WORKDIR/conf",
 ]
+<<<<<<< 9106d8d66f1086dc22fb5a80ebfea3a38f04a2d1
 watch_exts = [".go", ".ini", ".toml", ".html"]
+=======
+watch_exts = [".go", ".ini", ".toml"]
+>>>>>>> fix(auth proxy): Fix for server side rendering of panel when using auth proxy, fixes #2568
 build_delay = 1500
 cmds = [
   ["go", "build", "-o", "./bin/grafana-server"],

CHANGELOG.md

@@ -143,6 +143,7 @@ Grunt & Watch tasks:
 # 2.1.2 (2015-08-20)
 
 **Fixes**
+<<<<<<< 9106d8d66f1086dc22fb5a80ebfea3a38f04a2d1
 <<<<<<< ed50e2846bc8380710f0ddcbde24a79bcbd3cce1
 <<<<<<< 350904500dc0256857920fc88984a84ee9ac44d8
 <<<<<<< 65d0d096a2b4b75b95d6288ba17fb3951389520f
@@ -194,6 +195,9 @@ repeat panel from url), fixes #2564
 - [Issue #2534](https://github.com/grafana/grafana/issues/2534). Templating: fix for setting template variable value via url and having repeated panels or rows
 >>>>>>> fix(dragdrop): Fix for broken drag drop behavior, fixes #2558
 =======
+=======
+- [Issue #2568](https://github.com/grafana/grafana/issues/2568). AuthProxy: Fix for server side rendering of panel when using auth proxy
+>>>>>>> fix(auth proxy): Fix for server side rendering of panel when using auth proxy, fixes #2568
 - [Issue #2490](https://github.com/grafana/grafana/issues/2490). Graphite: Dashboard import was broken in 2.1 and 2.1.1, working now
 - [Issue #2565](https://github.com/grafana/grafana/issues/2565). TimePicker: Fix for when you applied custom time range it did not refreh dashboard
 fixes #2565

pkg/middleware/auth_proxy.go

@@ -1,13 +1,20 @@
 package middleware
 
 import (
+<<<<<<< 9106d8d66f1086dc22fb5a80ebfea3a38f04a2d1
 	"github.com/Cepave/grafana/pkg/bus"
 <<<<<<< a84f1f0a3df6380f5a6561dd65aca819f7df5e8a
 	"github.com/Cepave/grafana/pkg/log"
 =======
 >>>>>>> Replace the import path with github.com/Cepave/grafana.
 	m "github.com/Cepave/grafana/pkg/models"
 	"github.com/Cepave/grafana/pkg/setting"
+=======
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/log"
+	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/setting"
+>>>>>>> fix(auth proxy): Fix for server side rendering of panel when using auth proxy, fixes #2568
 )
 
 func initContextWithAuthProxy(ctx *Context) bool {