Update docs

dyarnell · Jul 16, 2013 · 247e095 · 247e095
1 parent 559e83d
commit 247e095
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -16,6 +16,7 @@ v 6.0.0
   - Generate fingerprint for ssh keys
   - You an use arrows to navigate at tree view
   - Apply user project limit only for personal projects
+  - API: Allow login with LDAP credentials
 
 v 5.4.0
   - Ability to edit own comments

diff --git a/doc/api/session.md b/doc/api/session.md
@@ -6,10 +6,13 @@ POST /session
 
 Parameters:
 
-+ `email` (required) - The email of user
++ `login` (required) - The login of user
++ `email` (required if login missing) - The email of user
 + `password` (required) - Valid password
 
 
+__You can login with both GitLab and LDAP credentials now__
+
 ```json
 {
   "id": 1,