Commit 247e0951864c6888cfdd18b8746c554df2916ec1
1 parent
559e83d3
Exists in
master
and in
4 other branches
Update docs
Showing
2 changed files
with
5 additions
and
1 deletions
Show diff stats
CHANGELOG
| @@ -16,6 +16,7 @@ v 6.0.0 | @@ -16,6 +16,7 @@ v 6.0.0 | ||
| 16 | - Generate fingerprint for ssh keys | 16 | - Generate fingerprint for ssh keys |
| 17 | - You an use arrows to navigate at tree view | 17 | - You an use arrows to navigate at tree view |
| 18 | - Apply user project limit only for personal projects | 18 | - Apply user project limit only for personal projects |
| 19 | + - API: Allow login with LDAP credentials | ||
| 19 | 20 | ||
| 20 | v 5.4.0 | 21 | v 5.4.0 |
| 21 | - Ability to edit own comments | 22 | - Ability to edit own comments |
doc/api/session.md
| @@ -6,10 +6,13 @@ POST /session | @@ -6,10 +6,13 @@ POST /session | ||
| 6 | 6 | ||
| 7 | Parameters: | 7 | Parameters: |
| 8 | 8 | ||
| 9 | -+ `email` (required) - The email of user | 9 | ++ `login` (required) - The login of user |
| 10 | ++ `email` (required if login missing) - The email of user | ||
| 10 | + `password` (required) - Valid password | 11 | + `password` (required) - Valid password |
| 11 | 12 | ||
| 12 | 13 | ||
| 14 | +__You can login with both GitLab and LDAP credentials now__ | ||
| 15 | + | ||
| 13 | ```json | 16 | ```json |
| 14 | { | 17 | { |
| 15 | "id": 1, | 18 | "id": 1, |