Resolve conflicts

app/finders/users_finder.rb

@@ -34,11 +34,8 @@ class UsersFinder
     users = by_external_identity(users)
     users = by_external(users)
     users = by_created_at(users)
-<<<<<<< HEAD
-    users = by_non_ldap(users)
-=======
     users = by_custom_attributes(users)
->>>>>>> upstream/master
+    users = by_non_ldap(users)
 
     users
   end

app/services/merge_requests/merge_service.rb

@@ -39,7 +39,6 @@ module MergeRequests
       end
     rescue MergeError => e
       handle_merge_error(log_message: e.message, save_message_on_model: true)
-<<<<<<< HEAD
     end
 
     def hooks_validation_pass?(merge_request)
@@ -62,8 +61,6 @@ module MergeRequests
       end
 
       true
-=======
->>>>>>> upstream/master
     end
 
     private

app/services/projects/hashed_storage_migration_service.rb

@@ -2,11 +2,8 @@ module Projects
   class HashedStorageMigrationService < BaseService
     include Gitlab::ShellAdapter
 
-<<<<<<< HEAD
     prepend ::EE::Projects::HashedStorageMigrationService
 
-=======
->>>>>>> upstream/master
     attr_reader :old_disk_path, :new_disk_path
 
     def initialize(project, logger = nil)

app/services/users/update_service.rb

@@ -14,11 +14,8 @@ module Users
 
       user_exists = @user.persisted?
 
-<<<<<<< HEAD
-=======
       assign_attributes(&block)
 
->>>>>>> upstream/master
       if @user.save(validate: validate)
         notify_success(user_exists)
       else

config/sidekiq_queues.yml

@@ -64,7 +64,6 @@
   - [background_migration, 1]
   - [project_migrate_hashed_storage, 1]
   - [storage_migrator, 1]
-<<<<<<< HEAD
   # EE specific queues
   - [ldap_group_sync, 2]
   - [geo, 1]
@@ -78,5 +77,3 @@
   - [elastic_commit_indexer, 1]
   - [export_csv, 1]
   - [object_storage_upload, 1]
-=======
->>>>>>> upstream/master

lib/api/users.rb

@@ -334,11 +334,7 @@ module API
         user = User.find_by(id: params.delete(:id))
         not_found!('User') unless user
 
-<<<<<<< HEAD
-        email = Emails::CreateService.new(current_user,  declared_params(include_missing: false).merge(user: user)).execute
-=======
         email = Emails::CreateService.new(current_user, declared_params(include_missing: false).merge(user: user)).execute
->>>>>>> upstream/master
 
         if email.errors.blank?
           NotificationService.new.new_email(email)

lib/gitlab/git_access.rb

@@ -19,11 +19,8 @@ module Gitlab
       command_not_allowed: "The command you're trying to execute is not allowed.",
       upload_pack_disabled_over_http: 'Pulling over HTTP is not allowed.',
       receive_pack_disabled_over_http: 'Pushing over HTTP is not allowed.',
-<<<<<<< HEAD
+      readonly: 'The repository is temporarily read-only. Please try again later.',
       cannot_push_to_secondary_geo: "You can't push code to a secondary GitLab Geo node."
-=======
-      readonly: 'The repository is temporarily read-only. Please try again later.'
->>>>>>> upstream/master
     }.freeze
 
     DOWNLOAD_COMMANDS = %w{ git-upload-pack git-upload-archive }.freeze

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-09-27 16:26+0200\n"
 "PO-Revision-Date: 2017-09-27 16:26+0200\n"
-=======
-"POT-Creation-Date: 2017-09-27 15:43+0100\n"
-"PO-Revision-Date: 2017-09-27 15:43+0100\n"
->>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -169,7 +164,6 @@ msgstr ""
 msgid "AutoDevOps|Learn more in the %{link_to_documentation}"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Billing"
 msgstr ""
 
@@ -224,8 +218,6 @@ msgstr ""
 msgid "Billinglans|Downgrade"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Branch"
 msgid_plural "Branches"
 msgstr[0] ""
@@ -804,12 +796,9 @@ msgstr ""
 msgid "IssueBoards|Board"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "IssueBoards|Boards"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Issues"
 msgstr ""
 

spec/factories/projects.rb

@@ -157,7 +157,6 @@ FactoryGirl.define do
       end
     end
 
-<<<<<<< HEAD
     trait :remote_mirror do
       transient do
         url "http://foo.com"
@@ -169,8 +168,6 @@ FactoryGirl.define do
       end
     end
 
-=======
->>>>>>> upstream/master
     trait :wiki_repo do
       after(:create) do |project|
         raise 'Failed to create wiki repository!' unless project.create_wiki

spec/models/project_spec.rb

@@ -2843,15 +2843,6 @@ describe Project do
     describe '#legacy_storage?' do
       it 'returns true when storage_version is nil' do
         project = build(:project, storage_version: nil)
-<<<<<<< HEAD
-
-        expect(project.legacy_storage?).to be_truthy
-      end
-
-      it 'returns true when the storage_version is 0' do
-        project = build(:project, storage_version: 0)
-=======
->>>>>>> upstream/master
 
         expect(project.legacy_storage?).to be_truthy
       end

spec/services/emails/destroy_service_spec.rb

@@ -5,13 +5,10 @@ describe Emails::DestroyService do
   let!(:email) { create(:email, user: user) }
 
   subject(:service) { described_class.new(user, user: user, email: email.email) }
-<<<<<<< HEAD
 
   before do
     stub_licensed_features(extended_audit_events: true)
   end
-=======
->>>>>>> upstream/master
 
   describe '#execute' do
     it 'removes an email' do