diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-28 16:49:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-28 16:49:43 +0000 |
| commit | 69f0370ad398db0202e3d0cf8459145ea08826dd (patch) | |
| tree | d2402a99dd96927ae458f49cbd7de8ad043e297a /lib/api/entities.rb | |
| parent | 93a33556e3e01a83c1af9c21e11ff433b624c40d (diff) | |
| parent | e9eae3eb0dd25e4a34c9a4b6bcc7de312dde4489 (diff) | |
| download | gitlab-ce-69f0370ad398db0202e3d0cf8459145ea08826dd.tar.gz | |
Merge branch 'feature/custom-attributes' into 'master'
Support custom attributes on users
See merge request gitlab-org/gitlab-ce!13038
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 7f4736a08cb..5d45b14f592 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1036,5 +1036,10 @@ module API expose :failing_on_hosts expose :total_failures end + + class CustomAttribute < Grape::Entity + expose :key + expose :value + end end end |