Fix conflicts after CE upstream merge

.gitlab-ci.yml

@@ -212,30 +212,6 @@ rake brakeman: *exec
 rake flay: *exec
 license_finder: *exec
 rake downtime_check: *exec
-<<<<<<< HEAD
-=======
-rake ee_compat_check:
-  <<: *exec
-  only:
-    - branches@gitlab-org/gitlab-ce
-    - branches@gitlab/gitlabhq
-  except:
-    - master
-    - tags
-    - /^[\d-]+-stable(-ee)?$/
-  allow_failure: yes
-  cache:
-    key: "ruby231-ee_compat_check_repo"
-    paths:
-      - ee_compat_check/repo/
-      - vendor/ruby
-  artifacts:
-    name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}_${CI_BUILD_REF}"
-    when: on_failure
-    expire_in: 10d
-    paths:
-      - ee_compat_check/patches/*.patch
->>>>>>> ce/master
 
 rake db:migrate:reset:
   stage: test

app/controllers/admin/application_settings_controller.rb

@@ -133,12 +133,9 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :elasticsearch_port,
       :usage_ping_enabled,
       :enabled_git_access_protocol,
-<<<<<<< HEAD
       :repository_size_limit,
-=======
       :sidekiq_throttling_enabled,
       :sidekiq_throttling_factor,
->>>>>>> ce/master
       :housekeeping_enabled,
       :housekeeping_bitmaps_enabled,
       :housekeeping_incremental_repack_period,

config/initializers/sidekiq.rb

@@ -29,12 +29,10 @@ Sidekiq.configure_server do |config|
   end
   Sidekiq::Cron::Job.load_from_hash! cron_jobs
 
-<<<<<<< HEAD
   # Gitlab Geo: enable bulk notify job only on primary node
   Gitlab::Geo.bulk_notify_job.disable! unless Gitlab::Geo.primary?
-=======
+
   Gitlab::SidekiqThrottler.execute!
->>>>>>> ce/master
 
   # Database pool should be at least `sidekiq_concurrency` + 2
   # For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md

db/schema.rb

@@ -1051,12 +1051,8 @@ ActiveRecord::Schema.define(version: 20161109150329) do
     t.boolean "repository_read_only"
     t.boolean "lfs_enabled"
     t.text "description_html"
-<<<<<<< HEAD
     t.integer "repository_size_limit"
-    t.boolean "only_allow_merge_if_all_discussions_are_resolved", default: false, null: false
-=======
     t.boolean "only_allow_merge_if_all_discussions_are_resolved"
->>>>>>> ce/master
   end
 
   add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree

lib/gitlab/current_settings.rb

@@ -53,16 +53,12 @@ module Gitlab
         akismet_enabled: false,
         repository_checks_enabled: true,
         container_registry_token_expire_delay: 5,
-<<<<<<< HEAD
         elasticsearch_search: false,
         elasticsearch_indexing: false,
         elasticsearch_host: ENV['ELASTIC_HOST'] || 'localhost',
         elasticsearch_port: ENV['ELASTIC_PORT'] || '9200',
-        user_default_external: false
-=======
         user_default_external: false,
         sidekiq_throttling_enabled: false,
->>>>>>> ce/master
       )
     end
 

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -39,7 +39,6 @@ describe Projects::MergeRequestsController do
     end
   end
 
-<<<<<<< HEAD
   describe 'POST #create' do
     def create_merge_request(overrides = {})
       params = {
@@ -123,7 +122,9 @@ describe Projects::MergeRequestsController do
       it 'shows the #new form' do
         expect(create_merge_request(title: nil)).to render_template(:new)
       end
-=======
+    end
+  end
+
   shared_examples "loads labels" do |action|
     it "loads labels into the @labels variable" do
       get action,