Merge branch 'upgrade-license-gem' into 'master'

Destroy licenses in test env to ensure a clean state and bump gitlab-license to 1.0.0

Specs would fail if an existing license in the DB were generated with a different private key.

Closes #643

See merge request !549

Gemfile

@@ -243,7 +243,7 @@ gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
 gem 'net-ssh',            '~> 3.0.1'
 gem 'base32',             '~> 0.3.0'
-gem "gitlab-license", "~> 0.0.4"
+gem "gitlab-license", "~> 1.0"
 
 # Sentry integration
 gem 'sentry-raven', '~> 1.1.0'

Gemfile.lock

@@ -295,7 +295,7 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-    gitlab-license (0.0.4)
+    gitlab-license (1.0.0)
     gitlab_git (10.2.3)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)

features/support/env.rb

@@ -29,6 +29,7 @@ Spinach.hooks.before_run do
   include ActiveJob::TestHelper
   RSpec::Mocks.setup
   TestEnv.init(mailer: false)
+  License.destroy_all
   TestLicense.init
 
   # skip pre-receive hook check so we can use

spec/spec_helper.rb

@@ -47,6 +47,7 @@ RSpec.configure do |config|
   end
 
   config.before(:all) do
+    License.destroy_all
     TestLicense.init
   end
 end