public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints

Browse Source 
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go

closes #2571
closes #2494
This commit is contained in:
carl bergquist
2015-12-11 15:16:57 +01:00
parent 8910351f5c 74ea266157
commit fab1062c0b
6 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/sample.ini
+3
View File
@@ -134,6 +134,9 @@
# Default role new users will be automatically assigned (if disabled above is set to true)
;auto_assign_org_role = Viewer
# Background text for the user field on the login page
;login_hint = email or username
#################################### Anonymous Auth ##########################
[auth.anonymous]
# enable anonymous access