summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-19 11:08:48 +0200
committerRémy Coutable <remy@rymai.me>2016-04-19 11:08:48 +0200
commit50bee8e9198f65a692e32710a32089270e166f6b (patch)
treec0b60dc281ddb6bda6292ddb6feab542d326f9b8 /lib/api/entities.rb
parentb2370fefad16b6b0a808a75b9a7b1d1613187693 (diff)
downloadgitlab-ce-license-templates-and-api-12804.tar.gz
Rename License entity to RepoLicense to avoid conflict with EElicense-templates-and-api-12804
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index e7af928b0e9..716ca6f7ed9 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -440,7 +440,7 @@ module API
expose :key, :value
end
- class License < Grape::Entity
+ class RepoLicense < Grape::Entity
expose :key, :name, :nickname
expose :featured, as: :popular
expose :url, as: :html_url