diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-01 09:24:21 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-01 09:24:21 +0000 |
| commit | 7317ef39977be31a9e890d0c650a765a899a99b5 (patch) | |
| tree | 882e18f550a512911e045fa1ebd37738b7555481 /lib/api/helpers | |
| parent | 36043ab9f1ebe4f32e0d3192b74c902aec4f266a (diff) | |
| parent | bc7877e8c15d9fb07824e00eeac20bb9c0f12997 (diff) | |
| download | gitlab-ce-7317ef39977be31a9e890d0c650a765a899a99b5.tar.gz | |
Merge branch 'feature/filter-groups-for-admin-in-dashboard' into 'master'
show only groups an admin is a member of in dashboards/grops
See merge request gitlab-org/gitlab-ce!17884
Diffstat (limited to 'lib/api/helpers')
| -rw-r--r-- | lib/api/helpers/custom_attributes.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/api/helpers/custom_attributes.rb b/lib/api/helpers/custom_attributes.rb index 70e4eda95f8..10d652e33f5 100644 --- a/lib/api/helpers/custom_attributes.rb +++ b/lib/api/helpers/custom_attributes.rb @@ -7,6 +7,9 @@ module API helpers do params :with_custom_attributes do optional :with_custom_attributes, type: Boolean, default: false, desc: 'Include custom attributes in the response' + + optional :custom_attributes, type: Hash, + desc: 'Filter with custom attributes' end def with_custom_attributes(collection_or_resource, options = {}) |