summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-13 15:56:37 +0200
committerRémy Coutable <remy@rymai.me>2016-04-18 14:47:50 +0200
commit2f18c77e1b0e3b6f3d668c3cb1814d4675641a75 (patch)
tree375a7e268cd000dabbdae555f137c280b80e7bf0 /lib/api/entities.rb
parent0aaaae9d0536c5637662f6c72a6612ec13f0342f (diff)
downloadgitlab-ce-2f18c77e1b0e3b6f3d668c3cb1814d4675641a75.tar.gz
Update to licensee 8.0.0 and fix API specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 61df948df60..e7af928b0e9 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -441,13 +441,14 @@ module API
end
class License < Grape::Entity
- expose :key, :name, :nickname, :featured
+ expose :key, :name, :nickname
+ expose :featured, as: :popular
expose :url, as: :html_url
expose(:source_url) { |license| license.meta['source'] }
expose(:description) { |license| license.meta['description'] }
- expose(:conditions) { |license| license.meta['required'] }
- expose(:permissions) { |license| license.meta['permitted'] }
- expose(:limitations) { |license| license.meta['forbidden'] }
+ expose(:conditions) { |license| license.meta['conditions'] }
+ expose(:permissions) { |license| license.meta['permissions'] }
+ expose(:limitations) { |license| license.meta['limitations'] }
expose :content
end
end