Fix merge conflicts for daily CE merge

All conflicts listed in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5482
are included

app/services/projects/destroy_service.rb

@@ -104,7 +104,6 @@ module Projects
 
     def rollback_repository(old_path, new_path)
       # There is a possibility project does not have repository or wiki
-<<<<<<< HEAD
       return true unless repo_exists?(old_path)
 
       mv_repository(old_path, new_path)
@@ -115,8 +114,6 @@ module Projects
     end
 
     def mv_repository(from_path, to_path)
-=======
->>>>>>> upstream/master
       return true unless gitlab_shell.exists?(project.repository_storage, from_path + '.git')
 
       gitlab_shell.mv_repository(project.repository_storage, from_path, to_path)

db/migrate/20161220141214_remove_dot_git_from_group_names.rb

@@ -60,11 +60,7 @@ class RemoveDotGitFromGroupNames < ActiveRecord::Migration
 
   def move_namespace(group_id, path_was, path)
     repository_storages = select_all("SELECT distinct(repository_storage) FROM projects WHERE namespace_id = #{group_id}").map do |row|
-<<<<<<< HEAD
-      Gitlab.config.repositories.storages[row['repository_storage']].legacy_disk_path
-=======
       row['repository_storage']
->>>>>>> upstream/master
     end.compact
 
     # Move the namespace directory in all storages paths used by member projects

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: 20180419031622) do
-=======
 ActiveRecord::Schema.define(version: 20180425131009) do
->>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

spec/factories/projects.rb

@@ -181,7 +181,6 @@ FactoryBot.define do
         # an API that isn't running
         project.gitlab_shell.rm_directory(project.repository_storage,
                                           File.join("#{project.disk_path}.git", 'hooks'))
-<<<<<<< HEAD
       end
     end
 
@@ -194,8 +193,6 @@ FactoryBot.define do
 
       after(:create) do |project, evaluator|
         project.remote_mirrors.create!(url: evaluator.url, enabled: evaluator.enabled)
-=======
->>>>>>> upstream/master
       end
     end
 

spec/helpers/projects_helper_spec.rb

@@ -283,11 +283,7 @@ describe ProjectsHelper do
     end
   end
 
-<<<<<<< HEAD
-  describe '#sanitized_repo_path' do
-=======
-  describe '#sanitizerepo_repo_path' do
->>>>>>> upstream/master
+  describe '#sanitize_repo_path' do
     let(:project) { create(:project, :repository) }
     let(:storage_path) { Gitlab.config.repositories.storages.default.legacy_disk_path }