summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-03-17 12:21:12 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-03-17 12:21:12 +0200
commit956e914307029dbfbdb387fd6c0749dd50935fa4 (patch)
tree1eba4952be74c4bccd1545d047f72b2122719fa8
parent51300d9b2a65a43742985847376150229b91c4ca (diff)
downloadgitlab-ce-956e914307029dbfbdb387fd6c0749dd50935fa4.tar.gz
Add missing API docs on external user
[ci skip]
-rw-r--r--doc/api/users.md1
-rw-r--r--lib/api/users.rb4
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index 44a29da5ecc..383e7c76ab0 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -220,6 +220,7 @@ Parameters:
- `bio` - User's biography
- `admin` (optional) - User is admin - true or false (default)
- `can_create_group` (optional) - User can create groups - true or false
+- `external` (optional) - Flags the user as external - true or false(default)
Note, at the moment this method does only return a 404 error,
even in cases where a 409 (Conflict) would be more appropriate,
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 8849fff60af..13ab17c6904 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -61,7 +61,7 @@ module API
# admin - User is admin - true or false (default)
# can_create_group - User can create groups - true or false
# confirm - Require user confirmation - true (default) or false
- # external - Is user an external user - true or false(default)
+ # external - Flags the user as external - true or false(default)
# Example Request:
# POST /users
post do
@@ -108,7 +108,7 @@ module API
# bio - Bio
# admin - User is admin - true or false (default)
# can_create_group - User can create groups - true or false
- # external - Is user an external user - true or false(default)
+ # external - Flags the user as external - true or false(default)
# Example Request:
# PUT /users/:id
put ":id" do