From 247e0951864c6888cfdd18b8746c554df2916ec1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 16 Jul 2013 11:50:00 +0300
Subject: [PATCH] Update docs
---
CHANGELOG | 1 +
doc/api/session.md | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 08cee5d2346..7f5cff9de37 100644
--- 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
index d68788d5583..8caf5fe1862 100644
--- 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,
--
GitLab