Resolve conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/models/application_setting.rb

@@ -55,7 +55,6 @@ class ApplicationSetting < ActiveRecord::Base
     user_default_external: false
   }
 
-<<<<<<< HEAD
   DEFAULTS_EE = {
     elasticsearch_host: ENV['ELASTIC_HOST'] || 'localhost',
     elasticsearch_port: ENV['ELASTIC_PORT'] || '9200',
@@ -63,9 +62,6 @@ class ApplicationSetting < ActiveRecord::Base
   }
 
   DEFAULTS = DEFAULTS_CE.merge(DEFAULTS_EE)
-=======
-  DEFAULTS = DEFAULTS_CE
->>>>>>> ce/master
 
   serialize :restricted_visibility_levels
   serialize :import_sources
@@ -230,13 +226,10 @@ class ApplicationSetting < ActiveRecord::Base
 
   def self.create_from_defaults
     create(DEFAULTS)
-<<<<<<< HEAD
   end
 
   def elasticsearch_host
     read_attribute(:elasticsearch_host).split(',').map(&:strip)
-=======
->>>>>>> ce/master
   end
 
   def home_page_url_column_exist

config/initializers/metrics.rb

@@ -107,7 +107,6 @@ def instrument_classes(instrumentation)
   instrumentation.instrument_methods(Gitlab::Highlight)
   instrumentation.instrument_instance_methods(Gitlab::Highlight)
 
-<<<<<<< HEAD
   instrumentation.instrument_methods(Elasticsearch::Git::Repository)
   instrumentation.instrument_instance_methods(Elasticsearch::Git::Repository)
 
@@ -130,8 +129,6 @@ def instrument_classes(instrumentation)
   instrumentation.instrument_instance_methods(Elastic::SnippetsSearch)
   instrumentation.instrument_instance_methods(Elastic::WikiRepositoriesSearch)
 
-=======
->>>>>>> ce/master
   # This is a Rails scope so we have to instrument it manually.
   instrumentation.instrument_method(Project, :visible_to_user)
 end

doc/user/permissions.md

@@ -67,17 +67,9 @@ The following table depicts the various user permission levels in a project.
 | Switch visibility level               |         |            |             |          | ✓      |
 | Transfer project to another namespace |         |            |             |          | ✓      |
 | Remove project                        |         |            |             |          | ✓      |
-<<<<<<< HEAD
-| Force push to protected branches [^2] |         |            |             |          |        |
-| Remove protected branches [^2]        |         |            |             |          |        |
-| Remove pages                          |         |            |             |          | ✓      |
-
-[^1]: If **Public pipelines** is enabled in **Project Settings > CI/CD Pipelines**
-[^2]: Not allowed for Guest, Reporter, Developer, Master, or Owner
-=======
 | Force push to protected branches [^3] |         |            |             |          |        |
 | Remove protected branches [^3]        |         |            |             |          |        |
->>>>>>> ce/master
+| Remove pages                          |         |            |             |          | ✓      |
 
 ## Group
 

doc/workflow/README.md

@@ -7,21 +7,17 @@
 - [Feature branch workflow](workflow.md)
 - [GitLab Flow](gitlab_flow.md)
 - [Groups](groups.md)
-<<<<<<< HEAD
-- [Importing to GitLab](doc/importing/README.md)
-=======
 - Issues - The GitLab Issue Tracker is an advanced and complete tool for
   tracking the evolution of a new idea or the process of solving a problem.
   - [Confidential issues](../user/project/issues/confidential_issues.md)
   - [Due date for issues](../user/project/issues/due_dates.md)
->>>>>>> ce/master
 - [Issue Board](../user/project/issue_board.md)
 - [Keyboard shortcuts](shortcuts.md)
 - [File finder](file_finder.md)
-- [File lock](../user/project/file_lock.md)
+- (EE) [File lock](../user/project/file_lock.md)
 - [Labels](../user/project/labels.md)
-- [Issue weight](issue_weight.md)
-- [Manage large binaries with git annex](git_annex.md)
+- (EE) [Issue weight](issue_weight.md)
+- (EE) [Manage large binaries with git annex](git_annex.md)
 - [Notification emails](notifications.md)
 - [Project Features](project_features.md)
 - [Project forking workflow](forking_workflow.md)
@@ -44,7 +40,7 @@
   - [Merge requests versions](../user/project/merge_requests/versions.md)
   - ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md)
   - (EE) [Merge Request Approvals](../user/project/merge_requests/merge_request_approvals.md)
-- [Repository Mirroring](repository_mirroring.md)
+- (EE) [Repository Mirroring](repository_mirroring.md)
 - [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md)
 - [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md)
 - [Todos](todos.md)

spec/models/user_spec.rb

@@ -1009,7 +1009,6 @@ describe User, models: true do
     end
   end
 
-<<<<<<< HEAD
   describe "#existing_member?" do
     it "returns true for exisitng user" do
       create :user, email: "bruno@example.com"
@@ -1031,10 +1030,7 @@ describe User, models: true do
     end
   end
 
-  describe "#sort" do
-=======
   describe '#sort' do
->>>>>>> ce/master
     before do
       User.delete_all
       @user = create :user, created_at: Date.today, last_sign_in_at: Date.today, name: 'Alpha'

spec/services/merge_requests/refresh_service_spec.rb

@@ -133,18 +133,12 @@ describe MergeRequests::RefreshService, services: true do
 
         it { expect(@merge_request.notes).to be_empty }
         it { expect(@merge_request).to be_open }
-<<<<<<< HEAD
         it { expect(@merge_request.approvals).not_to be_empty }
-=======
->>>>>>> ce/master
         it { expect(@fork_merge_request.notes.last.note).to include('added 28 commits') }
         it { expect(@fork_merge_request).to be_open }
         it { expect(@build_failed_todo).to be_pending }
         it { expect(@fork_build_failed_todo).to be_pending }
-<<<<<<< HEAD
         it { expect(@fork_merge_request.approvals).to be_empty }
-=======
->>>>>>> ce/master
       end
 
       context 'closed fork merge request' do
@@ -161,18 +155,12 @@ describe MergeRequests::RefreshService, services: true do
 
         it { expect(@merge_request.notes).to be_empty }
         it { expect(@merge_request).to be_open }
-<<<<<<< HEAD
         it { expect(@merge_request.approvals).not_to be_empty }
-=======
->>>>>>> ce/master
         it { expect(@fork_merge_request.notes).to be_empty }
         it { expect(@fork_merge_request).to be_closed }
         it { expect(@build_failed_todo).to be_pending }
         it { expect(@fork_build_failed_todo).to be_pending }
-<<<<<<< HEAD
         it { expect(@fork_merge_request.approvals).to be_empty }
-=======
->>>>>>> ce/master
       end
     end