Merge branch 'expose-add-ons-in-license-api' into 'master'

Expose add-ons associated to the license in /license endpoint.

Closes #1286

See merge request !907

doc/api/license.md

@@ -19,7 +19,10 @@ GET /license
     "Email": "john@doe.com"
   },
   "user_limit": 100,
-  "active_users": 60
+  "active_users": 60,
+  "add_ons": {
+    "GitLab_FileLocks": 100
+  }
 }
 ```
 
@@ -49,7 +52,10 @@ Example response:
     "Email": "john@doe.com"
   },
   "user_limit": 100,
-  "active_users": 60
+  "active_users": 60,
+  "add_ons": {
+    "GitLab_FileLocks": 100
+  }
 }
 ```
 

lib/api/entities.rb

@@ -583,7 +583,7 @@ module API
     end
 
     class License < Grape::Entity
-      expose :starts_at, :expires_at, :licensee
+      expose :starts_at, :expires_at, :licensee, :add_ons
 
       expose :user_limit do |license, options|
         license.restricted?(:active_user_count) ? license.restrictions[:active_user_count] : 0

spec/factories/licenses.rb

@@ -5,6 +5,9 @@ FactoryGirl.define do
     licensee do
       { "Name" => FFaker::Name.name }
     end
+    restrictions do
+      { add_ons: { 'GitLab_FileLocks' => 1 } }
+    end
     notify_users_at   { |l| l.expires_at }
     notify_admins_at  { |l| l.expires_at }
   end

spec/requests/api/license_spec.rb

@@ -17,6 +17,7 @@ describe API::API, api: true  do
       expect(Date.parse(json_response['expires_at'])).to eq Date.today + 11.months
       expect(json_response['active_users']).to eq 1
       expect(json_response['licensee']).not_to be_empty
+      expect(json_response['add_ons']).to eq({ 'GitLab_FileLocks' => 1 })
     end
 
     it 'denies access if not admin' do