diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-03-29 16:20:23 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-03-29 16:21:16 -0400 |
commit | 999ae7f76b275d4b8527a7ebbc012b20220e22b5 (patch) | |
tree | abae499dcc8220181b5551d3e46226283e43e253 /lib/api/entities.rb | |
parent | a9f5df384ef8d1f21a3659b785302f87e822299d (diff) | |
parent | c8be7f1cf027d27bba50f6fa4fdeaee33e3f531f (diff) | |
download | gitlab-ce-999ae7f76b275d4b8527a7ebbc012b20220e22b5.tar.gz |
Merge branch 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master'
api - expose label description
Resolves #14415
See merge request !3314
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 197e826e5bc..f686c568bee 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -292,7 +292,7 @@ module API end class Label < Grape::Entity - expose :name, :color + expose :name, :color, :description end class Compare < Grape::Entity |