CE->EE: Fix the majority of conflicts

app/models/concerns/repository_mirroring.rb

 module RepositoryMirroring
-<<<<<<< HEAD
+  IMPORT_HEAD_REFS = '+refs/heads/*:refs/heads/*'.freeze
+  IMPORT_TAG_REFS = '+refs/tags/*:refs/tags/*'.freeze
+
   def storage_path
     @project.repository_storage_path
   end
@@ -12,13 +14,6 @@ module RepositoryMirroring
     gitlab_shell.delete_remote_branches(storage_path, disk_path, remote, branches)
   end
 
-  def set_remote_as_mirror(name)
-    config = raw_repository.rugged.config
-=======
-  IMPORT_HEAD_REFS = '+refs/heads/*:refs/heads/*'.freeze
-  IMPORT_TAG_REFS = '+refs/tags/*:refs/tags/*'.freeze
->>>>>>> ce/master
-
   def set_remote_as_mirror(name)
     # This is used to define repository as equivalent as "git clone --mirror"
     raw_repository.rugged.config["remote.#{name}.fetch"] = 'refs/*:refs/*'

app/serializers/merge_request_entity.rb

@@ -13,19 +13,17 @@ class MergeRequestEntity < IssuableEntity
   expose :target_branch
   expose :target_project_id
 
-<<<<<<< HEAD
+  expose :should_be_rebased?, as: :should_be_rebased
+  expose :ff_only_enabled do |merge_request|
+    merge_request.project.merge_requests_ff_only_enabled
+  end
+
   # EE-specific
   expose :approvals_before_merge
   expose :squash
   expose :rebase_commit_sha
   expose :rebase_in_progress?, as: :rebase_in_progress
-=======
->>>>>>> ce/master
-  expose :should_be_rebased?, as: :should_be_rebased
-  expose :ff_only_enabled do |merge_request|
-    merge_request.project.merge_requests_ff_only_enabled
-  end
-<<<<<<< HEAD
+
   expose :can_push_to_source_branch do |merge_request|
     presenter(merge_request).can_push_to_source_branch?
   end
@@ -35,8 +33,6 @@ class MergeRequestEntity < IssuableEntity
   expose :approvals_path do |merge_request|
     presenter(merge_request).approvals_path
   end
-=======
->>>>>>> ce/master
 
   # Events
   expose :merge_event, using: EventEntity

app/services/emails/create_service.rb

 module Emails
   class CreateService < ::Emails::BaseService
-<<<<<<< HEAD
     prepend ::EE::Emails::CreateService
 
-    def execute
-      @user.emails.create(email: @email)
-=======
     def execute(extra_params = {})
       @user.emails.create(@params.merge(extra_params))
->>>>>>> ce/master
     end
   end
 end

app/services/emails/destroy_service.rb

 module Emails
   class DestroyService < ::Emails::BaseService
-<<<<<<< HEAD
     prepend ::EE::Emails::DestroyService
 
-    def execute
-      update_secondary_emails! if Email.find_by_email!(@email).destroy
-=======
     def execute(email)
       email.destroy && update_secondary_emails!
->>>>>>> ce/master
     end
 
     private

config/initializers/1_settings.rb

@@ -374,14 +374,11 @@ Settings.pages['url']               ||= Settings.__send__(:build_pages_url)
 Settings.pages['external_http']     ||= false unless Settings.pages['external_http'].present?
 Settings.pages['external_https']    ||= false unless Settings.pages['external_https'].present?
 Settings.pages['artifacts_server']  ||= Settings.pages['enabled'] if Settings.pages['artifacts_server'].nil?
-<<<<<<< HEAD
 
 #
 # Geo
 #
 Settings.gitlab['geo_status_timeout'] ||= 10
-=======
->>>>>>> ce/master
 
 #
 # Git LFS

config/webpack.config.js

@@ -74,13 +74,10 @@ var config = {
     protected_branches:   './protected_branches',
     ee_protected_branches: 'ee/protected_branches',
     protected_tags:       './protected_tags',
-<<<<<<< HEAD
     ee_protected_tags:    'ee/protected_tags',
     service_desk:         './projects/settings_service_desk/service_desk_bundle.js',
     service_desk_issues:  './service_desk_issues/index.js',
-=======
     registry_list:        './registry/index.js',
->>>>>>> ce/master
     repo:                 './repo/index.js',
     sidebar:              './sidebar/sidebar_bundle.js',
     schedule_form:        './pipeline_schedules/pipeline_schedule_form_bundle.js',

features/project/ff_merge_requests.feature

@@ -22,7 +22,6 @@ Feature: Project Ff Merge Requests
     Then I should see ff-only merge button
     When I accept this merge request
     Then I should see merged request
-<<<<<<< HEAD
 
   @javascript
   Scenario: I do rebase before ff-only merge
@@ -40,5 +39,3 @@ Feature: Project Ff Merge Requests
     Then I should see rebase button
     When I press rebase button
     Then I should see rebase in progress message
-=======
->>>>>>> ce/master

features/steps/project/ff_merge_requests.rb

@@ -17,13 +17,10 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
            author: project.users.first)
   end
 
-<<<<<<< HEAD
   step 'merge request is mergeable' do
     expect(page).to have_button 'Merge'
   end
 
-=======
->>>>>>> ce/master
   step 'I should see ff-only merge button' do
     expect(page).to have_content "Fast-forward merge without a merge commit"
     expect(page).to have_button 'Merge'
@@ -52,13 +49,10 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
     project.save!
   end
 
-<<<<<<< HEAD
   step 'I should see rebase button' do
     expect(page).to have_button "Rebase"
   end
 
-=======
->>>>>>> ce/master
   step 'merge request "Bug NS-05" is rebased' do
     merge_request.source_branch = 'flatten-dir'
     merge_request.target_branch = 'improve/awesome'
@@ -73,7 +67,6 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
     merge_request.save!
   end
 
-<<<<<<< HEAD
   step 'rebase before merge enabled' do
     project = merge_request.target_project
     project.merge_requests_rebase_enabled = true
@@ -88,8 +81,6 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
     expect(page).to have_content("Rebase in progress")
   end
 
-=======
->>>>>>> ce/master
   def merge_request
     @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
   end

locale/gitlab.pot

@@ -8,13 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2017-10-02 15:48-0400\n"
-"PO-Revision-Date: 2017-10-02 15:48-0400\n"
-=======
 "POT-Creation-Date: 2017-10-03 16:06-0400\n"
 "PO-Revision-Date: 2017-10-03 16:06-0400\n"
->>>>>>> ce/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

spec/fixtures/api/schemas/entities/merge_request.json

@@ -96,29 +96,24 @@
     "commit_change_content_path": { "type": "string" },
     "remove_wip_path": { "type": ["string", "null"] },
     "commits_count": { "type": "integer" },
-    "merge_ongoing": { "type": "boolean" },
     "remove_source_branch": { "type": ["boolean", "null"] },
-<<<<<<< HEAD
+    "merge_ongoing": { "type": "boolean" },
+    "ff_only_enabled": { "type": ["boolean", false] },
+    "should_be_rebased": { "type": "boolean" },
+
     // EE-specific
     "rebase_commit_sha": { "type": ["string", "null"] },
     "approvals_before_merge": { "type": ["integer", "null"] },
     "squash": { "type": "boolean" },
     "rebase_in_progress": { "type": "boolean" },
-    "should_be_rebased": { "type": "boolean" },
     "can_push_to_source_branch": { "type": "boolean" },
     "rebase_path": { "type": ["string", "null"] },
     "approved": { "type": "boolean" },
     "approvals_path": { "type": ["string", "null"] },
-    "ff_only_enabled": { "type": "boolean" },
     "codeclimate": {
       "head_path": { "type": "string" },
       "base_path": { "type": "string" }
     }
-=======
-    "merge_ongoing": { "type": "boolean" },
-    "ff_only_enabled": { "type": ["boolean", false] },
-    "should_be_rebased": { "type": "boolean" }
->>>>>>> ce/master
   },
   "additionalProperties": false
 }

spec/lib/gitlab/path_regex_spec.rb

@@ -86,11 +86,7 @@ describe Gitlab::PathRegex do
       route.split('/')[1]
     end.compact
 
-<<<<<<< HEAD
-    words + files_in_public + Array(API::API.prefix.to_s)
-=======
     (words + ee_top_level_words + files_in_public + Array(API::API.prefix.to_s)).uniq
->>>>>>> ce/master
   end
 
   let(:ee_top_level_words) do

spec/lib/gitlab/shell_spec.rb

@@ -678,14 +678,6 @@ describe Gitlab::Shell do
     end
   end
 
-<<<<<<< HEAD
-  def find_in_authorized_keys_file(key_id)
-    gitlab_shell.batch_read_key_ids do |ids|
-      return true if ids.include?(key_id)
-    end
-
-    false
-=======
   describe 'namespace actions' do
     subject { described_class.new }
     let(:storage_path) { Gitlab.config.repositories.storages.default.path }
@@ -732,6 +724,13 @@ describe Gitlab::Shell do
         expect(subject.exists?(storage_path, "2mep")).to be(true)
       end
     end
->>>>>>> ce/master
+  end
+
+  def find_in_authorized_keys_file(key_id)
+    gitlab_shell.batch_read_key_ids do |ids|
+      return true if ids.include?(key_id)
+    end
+
+    false
   end
 end

spec/serializers/merge_request_entity_spec.rb

@@ -38,15 +38,11 @@ describe MergeRequestEntity do
                                :create_issue_to_resolve_discussions_path,
                                :source_branch_path, :target_branch_commits_path,
                                :target_branch_tree_path, :commits_count, :merge_ongoing,
-<<<<<<< HEAD
                                :ff_only_enabled,
                                ## EE
                                :can_push_to_source_branch, :approvals_before_merge,
                                :squash, :rebase_commit_sha, :rebase_in_progress,
                                :approvals_path)
-=======
-                               :ff_only_enabled)
->>>>>>> ce/master
   end
 
   it 'has email_patches_path' do

spec/support/update_invalid_issuable.rb

@@ -28,17 +28,11 @@ shared_examples 'update invalid issuable' do |klass|
     if klass == MergeRequest
       it 'renders edit when format is html' do
         put :update, params
-<<<<<<< HEAD
 
         expect(response).to render_template(:edit)
         expect(assigns[:conflict]).to be_truthy
 
         expect(assigns[:suggested_approvers]).to be_an(Array) if issuable.requires_approve?
-=======
-
-        expect(response).to render_template(:edit)
-        expect(assigns[:conflict]).to be_truthy
->>>>>>> ce/master
       end
     end
 

spec/tasks/gitlab/backup_rake_spec.rb

@@ -256,14 +256,10 @@ describe 'gitlab:app namespace rake task' do
       after do
         FileUtils.rm_rf('tmp/tests/default_storage')
         FileUtils.rm_rf('tmp/tests/custom_storage')
-<<<<<<< HEAD
-        FileUtils.rm(@backup_tar)
+        FileUtils.rm(@backup_tar) if @backup_tar
 
         # We unstub the storages to be able to reconfigure the actual Gitaly channels
         allow(Gitlab.config.repositories).to receive(:storages).and_call_original
-=======
-        FileUtils.rm(@backup_tar) if @backup_tar
->>>>>>> ce/master
       end
 
       it 'includes repositories in all repository storages' do