Resolve conflicts from CE to EE merge

spec/services/projects/update_service_spec.rb

 require 'spec_helper'
 
 describe Projects::UpdateService, '#execute' do
-<<<<<<< HEAD
   include StubConfiguration
-
-=======
   let(:gitlab_shell) { Gitlab::Shell.new }
->>>>>>> ce-com/master
   let(:user) { create(:user) }
   let(:admin) { create(:admin) }