Resolve merge conflicts

.rubocop_todo.yml

@@ -226,11 +226,8 @@ Style/PredicateName:
 Style/PreferredHashMethods:
   Enabled: false
 
-<<<<<<< HEAD
-# Offense count: 64
-=======
+
 # Offense count: 62
->>>>>>> ce/master
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded

app/models/concerns/repository_mirroring.rb

 module RepositoryMirroring
-<<<<<<< HEAD
   def storage_path
     @project.repository_storage_path
   end
@@ -12,8 +11,6 @@ module RepositoryMirroring
     gitlab_shell.delete_remote_branches(storage_path, path_with_namespace, remote, branches)
   end
 
-=======
->>>>>>> ce/master
   def set_remote_as_mirror(name)
     config = raw_repository.rugged.config
 
@@ -29,7 +26,6 @@ module RepositoryMirroring
     fetch_remote(remote, forced: true)
     remove_remote(remote)
   end
-<<<<<<< HEAD
 
   def remote_tags(remote)
     gitlab_shell.list_remote_tags(storage_path, path_with_namespace, remote).map do |name, target|
@@ -52,6 +48,4 @@ module RepositoryMirroring
 
     branches
   end
-=======
->>>>>>> ce/master
 end

app/models/merge_request.rb

@@ -3,11 +3,8 @@ class MergeRequest < ActiveRecord::Base
   include Issuable
   include Referable
   include Sortable
-<<<<<<< HEAD
   include Elastic::MergeRequestsSearch
   include Approvable
-=======
->>>>>>> ce/master
 
   belongs_to :target_project, class_name: "Project"
   belongs_to :source_project, class_name: "Project"

app/models/repository.rb

@@ -4,13 +4,9 @@ require 'forwardable'
 
 class Repository
   include Gitlab::ShellAdapter
-<<<<<<< HEAD
   include Elastic::RepositoriesSearch
   include RepositoryMirroring
   prepend EE::Repository
-=======
-  include RepositoryMirroring
->>>>>>> ce/master
 
   attr_accessor :path_with_namespace, :project
 

app/models/system_note_metadata.rb

 class SystemNoteMetadata < ActiveRecord::Base
   ICON_TYPES = %w[
-<<<<<<< HEAD
-    commit merge confidentiality status label assignee cross_reference
-    title time_tracking branch milestone discussion task moved approvals
-=======
     commit merge confidential visible label assignee cross_reference
     title time_tracking branch milestone discussion task moved opened closed merged
->>>>>>> ce/master
+    approvals
   ].freeze
 
   validates :note, presence: true

app/services/search/global_service.rb

@@ -35,10 +35,7 @@ module Search
     def scope
       @scope ||= begin
         allowed_scopes = %w[issues merge_requests milestones]
-<<<<<<< HEAD
         allowed_scopes += %w[blobs commits] if current_application_settings.elasticsearch_search?
-=======
->>>>>>> ce/master
 
         allowed_scopes.delete(params[:scope]) { 'projects' }
       end

db/fixtures/development/18_abuse_reports.rb

@@ -4,17 +4,10 @@ module Db
       class AbuseReport
         def self.seed
           Gitlab::Seeder.quiet do
-<<<<<<< HEAD
-            (::AbuseReport.default_per_page + 3).times do
-              reported_user =
-                ::User.create!(
-                  username: FFaker::Internet.user_name,
-=======
             (::AbuseReport.default_per_page + 3).times do |i|
               reported_user =
                 ::User.create!(
                   username: "reported_user_#{i}",
->>>>>>> ce/master
                   name: FFaker::Name.name,
                   email: FFaker::Internet.email,
                   confirmed_at: DateTime.now,

lib/gitlab/shell.rb

@@ -88,7 +88,6 @@ module Gitlab
       true
     end
 
-<<<<<<< HEAD
     def list_remote_tags(storage, name, remote)
       output, status = Popen.popen([gitlab_shell_projects_path, 'list-remote-tags', storage, "#{name}.git", remote])
       tags_with_targets = []
@@ -117,8 +116,6 @@ module Gitlab
       Hash[*tags_with_targets]
     end
 
-=======
->>>>>>> ce/master
     # Fetch remote for repository
     #
     # name - project path with namespace

spec/mailers/notify_spec.rb

@@ -188,10 +188,7 @@ describe Notify do
         let(:merge_author) { create(:user) }
         let(:merge_request) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project) }
         let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: 'My awesome description') }
-<<<<<<< HEAD
         let(:merge_request_with_approver) { create(:merge_request_with_approver, author: current_user, assignee: assignee, source_project: project, target_project: project) }
-=======
->>>>>>> ce/master
 
         describe 'that are new' do
           subject { Notify.new_merge_request_email(merge_request.assignee_id, merge_request.id) }