bergquist 26c6437846 Merge branch 'master' into alerting %!s(int64=9) %!d(string=hai) anos
..
setting.go 26c6437846 Merge branch 'master' into alerting %!s(int64=9) %!d(string=hai) anos
setting_oauth.go ddaac50a25 Add allow_sign_up override for auth.google/github. %!s(int64=10) %!d(string=hai) anos
setting_quota.go 86ed85aa6e move toMap function to be a method on the quota structs %!s(int64=10) %!d(string=hai) anos
setting_smtp.go bb2d810709 Final work password reset email, Closes #1456 %!s(int64=10) %!d(string=hai) anos
setting_test.go aa064b18e8 Test environment override for secret and url with credentials %!s(int64=9) %!d(string=hai) anos