CE->EE: Fix conflicts

app/controllers/concerns/lfs_request.rb

@@ -75,10 +75,7 @@ module LfsRequest
   def lfs_upload_access?
     return false unless project.lfs_enabled?
     return false unless has_authentication_ability?(:push_code)
-<<<<<<< HEAD
     return false if project.above_size_limit? || objects_exceed_repo_limit?
-=======
->>>>>>> ce/master
 
     lfs_deploy_token? || can?(user, :push_code, project)
   end

app/models/user.rb

@@ -286,7 +286,6 @@ class User < ActiveRecord::Base
     def find_by_any_email(email)
       by_any_email(email).take
     end
-<<<<<<< HEAD
 
     # Returns a relation containing all the users for the given Email address
     def by_any_email(email)
@@ -299,16 +298,6 @@ class User < ActiveRecord::Base
 
     def existing_member?(email)
       User.where(email: email).any? || Email.where(email: email).any?
-=======
-
-    # Returns a relation containing all the users for the given Email address
-    def by_any_email(email)
-      users = where(email: email)
-      emails = joins(:emails).where(emails: { email: email })
-      union = Gitlab::SQL::Union.new([users, emails])
-
-      from("(#{union.to_sql}) #{table_name}")
->>>>>>> ce/master
     end
 
     def filter(filter_name)

app/workers/repository_import_worker.rb

@@ -27,13 +27,10 @@ class RepositoryImportWorker
     raise ImportError, result[:message] if result[:status] == :error
 
     project.after_import
-<<<<<<< HEAD
 
     # Explicitly enqueue mirror for update so
     # that upstream remote is created and fetched
     project.force_import_job! if project.mirror?
-=======
->>>>>>> ce/master
   rescue ImportError => ex
     fail_import(project, ex.message)
     raise

spec/requests/lfs_http_spec.rb

@@ -683,7 +683,6 @@ describe 'Git LFS API and storage' do
           expect(json_response['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.full_path}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}")
           expect(json_response['objects'].first['actions']['upload']['header']).to eq('Authorization' => authorization)
         end
-<<<<<<< HEAD
 
         ## EE-specific context
         context 'and project is above the limit' do
@@ -712,8 +711,6 @@ describe 'Git LFS API and storage' do
             expect(json_response['message']).to eql('Your push has been rejected, because this repository has exceeded its size limit of 300 MB by 50 MB. Please contact your GitLab administrator for more information.')
           end
         end
-=======
->>>>>>> ce/master
       end
 
       describe 'when request is authenticated' do