summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--doc/api/session.md5
2 files changed, 5 insertions, 1 deletions
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,