Merge branch 'id-robust-license-method' into 'master'

Repository#license returns nil when license_key is not recognised

See merge request gitlab-org/gitlab!69878

app/models/repository.rb

@@ -627,7 +627,12 @@ class Repository
   def license
     return unless license_key
 
-    Licensee::License.new(license_key)
+    licensee_object = Licensee::License.new(license_key)
+
+    return if licensee_object.name.blank?
+
+    licensee_object
+  rescue Licensee::InvalidLicense
   end
   memoize_method :license
 

spec/models/repository_spec.rb

@@ -1338,6 +1338,12 @@ RSpec.describe Repository do
       expect(repository.license).to be_nil
     end
 
+    it 'returns nil when license_key is not recognized' do
+      expect(repository).to receive(:license_key).twice.and_return('not-recognized')
+
+      expect(repository.license).to be_nil
+    end
+
     it 'returns other when the content is not recognizable' do
       license = Licensee::License.new('other')
       repository.create_file(user, 'LICENSE', 'Gitlab B.V.',