Merge branch '3513-follow-up-from-simplify-specification-of-ee-license-plan-features' into 'master'

Fix NoMethodError: undefined method `>' for nil:NilClass in license.rb

Closes #3513

See merge request gitlab-org/gitlab-ee!2994

app/models/license.rb

@@ -220,7 +220,7 @@ class License < ActiveRecord::Base
   end
 
   def features_from_add_ons
-    add_ons.map { |name, count| FEATURES_FOR_ADD_ONS[name] if count > 0 }.compact
+    add_ons.map { |name, count| FEATURES_FOR_ADD_ONS[name] if count.to_i > 0 }.compact
   end
 
   def features

spec/models/license_spec.rb

@@ -436,6 +436,14 @@ describe License do
           expect(license.features_from_add_ons).to match_array([:deploy_board, :file_locks])
         end
       end
+
+      context 'with nil add-ons' do
+        it 'returns an empty array' do
+          license = build_license_with_add_ons({ 'GitLab_DeployBoard' => nil, 'GitLab_FileLocks' => nil })
+
+          expect(license.features_from_add_ons).to eq([])
+        end
+      end
     end
 
     describe '#feature_available?' do