Resolve CE->EE conflicts in application code

app/models/project.rb

@@ -18,12 +18,9 @@ class Project < ActiveRecord::Base
   include SelectForProjectAuthorization
   include Routable
   include Storage::LegacyProject
-<<<<<<< HEAD
 
   # EE specific modules
   prepend EE::Project
-=======
->>>>>>> ce/master
 
   extend Gitlab::ConfigHelper
 

app/models/project_wiki.rb

 class ProjectWiki
   include Gitlab::ShellAdapter
-<<<<<<< HEAD
+  include Storage::LegacyProjectWiki
+
+  # EE only modules
   include Elastic::WikiRepositoriesSearch
   include Gitlab::CurrentSettings
-=======
->>>>>>> ce/master
-  include Storage::LegacyProjectWiki
 
   MARKUPS = {
     'Markdown' => :markdown,

app/services/ci/pipeline_trigger_service.rb

@@ -3,11 +3,8 @@ module Ci
     def execute
       if trigger_from_token
         create_pipeline_from_trigger(trigger_from_token)
-<<<<<<< HEAD
       elsif job_from_token
         create_pipeline_from_job(job_from_token)
-=======
->>>>>>> ce/master
       end
     end
 
@@ -30,7 +27,6 @@ module Ci
       end
     end
 
-<<<<<<< HEAD
     def create_pipeline_from_job(job)
       # this check is to not leak the presence of the project if user cannot read it
       return unless can?(job.user, :read_project, project)
@@ -55,23 +51,18 @@ module Ci
       end
     end
 
-=======
->>>>>>> ce/master
     def trigger_from_token
       return @trigger if defined?(@trigger)
 
       @trigger = Ci::Trigger.find_by_token(params[:token].to_s)
     end
 
-<<<<<<< HEAD
     def job_from_token
       return @job if defined?(@job)
 
       @job = Ci::Build.find_by_token(params[:token].to_s)
     end
 
-=======
->>>>>>> ce/master
     def create_pipeline_variables!(pipeline)
       return unless params[:variables]
 

app/services/git_push_service.rb

@@ -131,13 +131,8 @@ class GitPushService < BaseService
     mirror_update = @project.mirror? && @project.repository.up_to_date_with_upstream?(branch_name)
 
     EventCreateService.new.push(@project, current_user, build_push_data)
-<<<<<<< HEAD
     Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute(:push, mirror_update: mirror_update)
 
-=======
-    Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute(:push)
-
->>>>>>> ce/master
     SystemHookPushWorker.perform_async(build_push_data.dup, :push_hooks)
     @project.execute_hooks(build_push_data.dup, :push_hooks)
     @project.execute_services(build_push_data.dup, :push_hooks)

app/services/merge_requests/base_service.rb

 module MergeRequests
   class BaseService < ::IssuableBaseService
-<<<<<<< HEAD
     prepend EE::MergeRequests::BaseService
 
-=======
->>>>>>> ce/master
     def create_note(merge_request, state = merge_request.state)
       SystemNoteService.change_status(merge_request, merge_request.target_project, current_user, state, nil)
     end

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20170726111039) do
-=======
 ActiveRecord::Schema.define(version: 20170728101014) do
->>>>>>> ce/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

lib/banzai/filter/upload_link_filter.rb

@@ -28,15 +28,11 @@ module Banzai
       end
 
       def build_url(uri)
-<<<<<<< HEAD
         if Gitlab::Geo.secondary?
           File.join(Gitlab::Geo.primary_node.url, project.full_path, uri)
         else
           File.join(Gitlab.config.gitlab.url, project.full_path, uri)
         end
-=======
-        File.join(Gitlab.config.gitlab.url, project.full_path, uri)
->>>>>>> ce/master
       end
 
       def project