Support custom attributes on groups

2 files changed, 13 insertions, 2 deletions

diff --git a/doc/api/custom_attributes.md b/doc/api/custom_attributes.md
index 705f1d401cf..91d1b0e1520 100644
--- a/doc/api/custom_attributes.md
+++ b/doc/api/custom_attributes.md
@@ -1,8 +1,9 @@
 # Custom Attributes API
 
 Every API call to custom attributes must be authenticated as administrator.
-Custom attributes are currently available on users and projects, which will
-be referred to as "resource" in this documentation.
+
+Custom attributes are currently available on users, groups, and projects,
+which will be referred to as "resource" in this documentation.
 
 ## List custom attributes
 
@@ -10,6 +11,7 @@ Get all custom attributes on a resource.
 
 ```
 GET /users/:id/custom_attributes
+GET /groups/:id/custom_attributes
 GET /projects/:id/custom_attributes
 ```
 
@@ -42,6 +44,7 @@ Get a single custom attribute on a resource.
 
 ```
 GET /users/:id/custom_attributes/:key
+GET /groups/:id/custom_attributes/:key
 GET /projects/:id/custom_attributes/:key
 ```
 
@@ -70,6 +73,7 @@ or newly created otherwise.
 
 ```
 PUT /users/:id/custom_attributes/:key
+PUT /groups/:id/custom_attributes/:key
 PUT /projects/:id/custom_attributes/:key
 ```
 
@@ -98,6 +102,7 @@ Delete a custom attribute on a resource.
 
 ```
 DELETE /users/:id/custom_attributes/:key
+DELETE /groups/:id/custom_attributes/:key
 DELETE /projects/:id/custom_attributes/:key
 ```
 
diff --git a/doc/api/groups.md b/doc/api/groups.md
index 99d200c9c93..16db9c2f259 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -74,6 +74,12 @@ GET /groups?statistics=true
 
 You can search for groups by name or path, see below.
 
+You can filter by [custom attributes](custom_attributes.md) with:
+
+```
+GET /groups?custom_attributes[key]=value&custom_attributes[other_key]=other_value
+```
+
 ## List a group's projects
 
 Get a list of projects in this group. When accessed without authentication, only