Resolve conflicts for gitlab-org/gitlab-ee!5257

app/models/project.rb

@@ -22,12 +22,9 @@ class Project < ActiveRecord::Base
   include DeploymentPlatform
   include ::Gitlab::Utils::StrongMemoize
   include ChronicDurationAttribute
-<<<<<<< HEAD
 
   # EE specific modules
   prepend EE::Project
-=======
->>>>>>> upstream/master
 
   extend Gitlab::ConfigHelper
 

app/policies/merge_request_policy.rb

 class MergeRequestPolicy < IssuablePolicy
-<<<<<<< HEAD
   prepend EE::MergeRequestPolicy
-=======
->>>>>>> upstream/master
 end

lib/api/helpers/projects_helpers.rb

@@ -28,7 +28,6 @@ module API
             optional :merge_method, type: String, values: %w(ff rebase_merge merge), desc: 'The merge method used when merging merge requests'
           end
 
-<<<<<<< HEAD
           params :optional_project_params_ee do
             optional :repository_storage, type: String, desc: 'Which storage shard the repository is on. Available only to admins'
             optional :approvals_before_merge, type: Integer, desc: 'How many approvers should approve merge request by default'
@@ -38,10 +37,6 @@ module API
           params :optional_project_params do
             use :optional_project_params_ce
             use :optional_project_params_ee
-=======
-          params :optional_project_params do
-            use :optional_project_params_ce
->>>>>>> upstream/master
           end
         end
       end

lib/api/projects.rb

@@ -267,7 +267,6 @@ module API
         optional :default_branch, type: String, desc: 'The default branch of the project'
         optional :path, type: String, desc: 'The path of the repository'
 
-<<<<<<< HEAD
         # EE
         at_least_one_of_ee = [
           :approvals_before_merge,
@@ -277,10 +276,6 @@ module API
 
         use :optional_project_params
         at_least_one_of(*(at_least_one_of_ce + at_least_one_of_ee))
-=======
-        use :optional_project_params
-        at_least_one_of(*at_least_one_of_ce)
->>>>>>> upstream/master
       end
       put ':id' do
         authorize_admin_project

lib/gitlab/import_export/import_export.yml

@@ -110,13 +110,10 @@ excluded_attributes:
     - :mirror_user_id
     - :mirror_trigger_builds
     - :storage_version
-<<<<<<< HEAD
     - :remote_mirror_available_overridden
     - :only_mirror_protected_branches
     - :pull_mirror_available_overridden
     - :mirror_overwrites_diverged_branches
-=======
->>>>>>> upstream/master
     - :description_html
   snippets:
     - :expired_at