Add latest changes from gitlab-org/gitlab@master

spec/serializers/variable_entity_spec.rb

@@ -10,7 +10,7 @@ describe VariableEntity do
     subject { entity.as_json }
     it 'contains required fields' do
-      expect(subject).to include(:id, :key, :value, :protected, :environment_scope)
+      expect(subject).to include(:id, :key, :value, :protected, :environment_scope, :variable_type)
     end
   end
 end

spec/services/quick_actions/interpret_service_spec.rb

@@ -804,7 +804,7 @@ describe QuickActions::InterpretService do
       let(:issuable) { issue }
     end
-    it_behaves_like 'empty command' do
+    it_behaves_like 'empty command', "Failed to assign a user because no user was found." do
       let(:content) { '/assign' }
       let(:issuable) { issue }
     end