Merge branch 'cohorts_page_without_license' into 'master'

Check if license exists before checking the addon.

Closes #2355

See merge request !1829

lib/gitlab/usage_data.rb

@@ -54,7 +54,7 @@ module Gitlab
       end
 
       def service_desk_counts
-        return {} unless ::License.current.add_on?('GitLab_ServiceDesk')
+        return {} unless ::License.current&.add_on?('GitLab_ServiceDesk')
 
         projects_with_service_desk = Project.where(service_desk_enabled: true)
 

spec/lib/gitlab/usage_data_spec.rb

@@ -103,6 +103,14 @@ describe Gitlab::UsageData do
       end
     end
 
+    context 'when there is no license' do
+      it 'returns an empty hash' do
+        allow(License).to receive(:current).and_return(nil)
+
+        expect(subject).to eq({})
+      end
+    end
+
     context 'when Service Desk is enabled' do
       it 'gathers Service Desk data' do
         create_list(:issue, 3, confidential: true, author: User.support_bot, project: [project3, project4].sample)