Fix bad conflict resolution

app/models/license.rb

@@ -59,9 +59,8 @@ class License < ActiveRecord::Base
     { DEPLOY_BOARD_FEATURE => 1 },
     { FILE_LOCK_FEATURE => 1 },
     { GEO_FEATURE => 1 },
-    { AUDITOR_USER_FEATURE => 1 },
-    { SERVICE_DESK_FEATURE => 1 },
     { OBJECT_STORAGE_FEATURE => 1 },
+    { SERVICE_DESK_FEATURE => 1 },
     { VARIABLE_ENVIRONMENT_SCOPE_FEATURE => 1 }
   ].freeze
 

spec/models/ci/variable_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Ci::Variable, models: true do
   subject { build(:ci_variable) }
 
-  let(:secret_value) { 'secret' }
+  it { is_expected.to include_module(HasVariable) }
 
   describe 'validations' do
     # EE
@@ -11,13 +11,7 @@ describe Ci::Variable, models: true do
       stub_licensed_features(variable_environment_scope: true)
     end
 
-    it { is_expected.to include_module(HasVariable) }
-    it { is_expected.to validate_presence_of(:key) }
     it { is_expected.to validate_uniqueness_of(:key).scoped_to(:project_id, :environment_scope) }
-    it { is_expected.to validate_length_of(:key).is_at_most(255) }
-    it { is_expected.to allow_value('foo').for(:key) }
-    it { is_expected.not_to allow_value('foo bar').for(:key) }
-    it { is_expected.not_to allow_value('foo/bar').for(:key) }
   end
 
   describe '.unprotected' do