Resolve merge conflicts

app/controllers/projects_controller.rb

@@ -382,15 +382,14 @@ class ProjectsController < Projects::ApplicationController
     project.repository.root_ref
   end
 
-<<<<<<< HEAD
   # ExtractsPath will set @id = project.path on the show route, but it has to be the
   # branch name for the tree view to work correctly.
   def assign_tree_vars
     @id = get_id
     tree
-=======
+  end
+
   def project_view_files_allowed?
     !project.empty_repo? && can?(current_user, :download_code, project)
->>>>>>> ce/master
   end
 end

app/models/concerns/discussion_on_diff.rb

@@ -2,15 +2,9 @@
 module DiscussionOnDiff
   extend ActiveSupport::Concern
 
-<<<<<<< HEAD
-  included do
-    NUMBER_OF_TRUNCATED_DIFF_LINES = 16
-
-=======
   NUMBER_OF_TRUNCATED_DIFF_LINES = 16
 
   included do
->>>>>>> ce/master
     delegate  :line_code,
               :original_line_code,
               :diff_file,

app/views/projects/blob/_header.html.haml

@@ -47,7 +47,6 @@
     = link_to 'Fork', fork_path, method: :post, class: 'btn btn-grouped btn-inverted btn-new'
     %button.js-cancel-fork-suggestion.btn.btn-grouped{ type: 'button' }
       Cancel
-<<<<<<< HEAD
 
 - if license_allows_file_locks?
   :javascript
@@ -55,5 +54,3 @@
       '#{toggle_namespace_project_path_locks_path(@project.namespace, @project)}',
       '#{@path}'
     );
-=======
->>>>>>> ce/master

lib/api/groups.rb

@@ -13,7 +13,6 @@ module API
         optional :share_with_group_lock, type: Boolean, desc: 'Prevent sharing a project with another group within this group'
       end
 
-<<<<<<< HEAD
       params :optional_params_ee do
         optional :membership_lock, type: Boolean, desc: 'Prevent adding new members to project membership within this group'
         optional :ldap_cn, type: String, desc: 'LDAP Common Name'
@@ -24,10 +23,6 @@ module API
       params :optional_params do
         use :optional_params_ce
         use :optional_params_ee
-=======
-      params :optional_params do
-        use :optional_params_ce
->>>>>>> ce/master
       end
 
       params :statistics_params do

lib/api/issues.rb

@@ -39,7 +39,6 @@ module API
         optional :confidential, type: Boolean, desc: 'Boolean parameter if the issue should be confidential'
       end
 
-<<<<<<< HEAD
       params :issue_params_ee do
         optional :weight, type: Integer, values: 0..9, desc: 'The weight of the issue'
       end
@@ -47,10 +46,6 @@ module API
       params :issue_params do
         use :issue_params_ce
         use :issue_params_ee
-=======
-      params :issue_params do
-        use :issue_params_ce
->>>>>>> ce/master
       end
     end
 

lib/api/merge_requests.rb

@@ -41,7 +41,6 @@ module API
           optional :remove_source_branch, type: Boolean, desc: 'Remove source branch when merging'
         end
 
-<<<<<<< HEAD
         params :optional_params_ee do
           optional :approvals_before_merge, type: Integer, desc: 'Number of approvals required before this can be merged'
           optional :squash, type: Boolean, desc: 'Squash commits when merging'
@@ -50,10 +49,6 @@ module API
         params :optional_params do
           use :optional_params_ce
           use :optional_params_ee
-=======
-        params :optional_params do
-          use :optional_params_ce
->>>>>>> ce/master
         end
       end
 
@@ -176,7 +171,6 @@ module API
         optional :state_event, type: String, values: %w[close reopen],
                                desc: 'Status of the merge request'
 
-<<<<<<< HEAD
         # EE
         at_least_one_of_ee = [
           :squash
@@ -184,10 +178,6 @@ module API
 
         use :optional_params
         at_least_one_of(*(at_least_one_of_ce + at_least_one_of_ee))
-=======
-        use :optional_params
-        at_least_one_of(*at_least_one_of_ce)
->>>>>>> ce/master
       end
       put ':id/merge_requests/:merge_request_iid' do
         merge_request = find_merge_request_with_access(params.delete(:merge_request_iid), :update_merge_request)

lib/api/projects.rb

@@ -23,7 +23,6 @@ module API
         optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all discussions are resolved'
       end
 
-<<<<<<< HEAD
       params :optional_params_ee do
         optional :repository_storage, type: String, desc: 'Which storage shard the repository is on. Available only to admins'
         optional :approvals_before_merge, type: Integer, desc: 'How many approvers should approve merge request by default'
@@ -32,10 +31,6 @@ module API
       params :optional_params do
         use :optional_params_ce
         use :optional_params_ee
-=======
-      params :optional_params do
-        use :optional_params_ce
->>>>>>> ce/master
       end
     end
 
@@ -238,7 +233,6 @@ module API
         optional :default_branch, type: String, desc: 'The default branch of the project'
         optional :path, type: String, desc: 'The path of the repository'
 
-<<<<<<< HEAD
         # EE
         at_least_one_of_ee = [
           :approvals_before_merge,
@@ -247,10 +241,6 @@ module API
 
         use :optional_params
         at_least_one_of(*(at_least_one_of_ce + at_least_one_of_ee))
-=======
-        use :optional_params
-        at_least_one_of(*at_least_one_of_ce)
->>>>>>> ce/master
       end
       put ':id' do
         authorize_admin_project

lib/api/settings.rb

@@ -160,7 +160,6 @@ module API
       end
       optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.'
       optional :polling_interval_multiplier, type: BigDecimal, desc: 'Interval multiplier used by endpoints that perform polling. Set to 0 to disable polling.'
-<<<<<<< HEAD
       at_least_one_of :default_branch_protection, :default_project_visibility, :default_snippet_visibility,
                       :default_group_visibility, :restricted_visibility_levels, :import_sources,
                       :enabled_git_access_protocol, :gravatar_enabled, :default_projects_limit,
@@ -203,10 +202,6 @@ module API
       optional :repository_size_limit, type: Integer, desc: 'Size limit per repository (MB)'
 
       at_least_one_of(*(at_least_one_of_ce + at_least_one_of_ee))
-=======
-
-      at_least_one_of(*at_least_one_of_ce)
->>>>>>> ce/master
     end
     put "application/settings" do
       attrs = declared_params(include_missing: false)

lib/api/users.rb

@@ -44,12 +44,9 @@ module API
         optional :external, type: Boolean, default: false, desc: 'Filters only external users'
         optional :blocked, type: Boolean, default: false, desc: 'Filters only blocked users'
 
-<<<<<<< HEAD
         # EE
         optional :skip_ldap, type: Boolean, default: false, desc: 'Skip LDAP users'
 
-=======
->>>>>>> ce/master
         use :pagination
       end
       get do

lib/gitlab/database.rb

@@ -57,17 +57,12 @@ module Gitlab
       postgresql? ? "RANDOM()" : "RAND()"
     end
 
-<<<<<<< HEAD
     def self.minute_interval(value)
       postgresql? ? "#{value} * '1 minute'::interval" : "INTERVAL #{value} MINUTE"
     end
 
-    def true_value
-      if Gitlab::Database.postgresql?
-=======
     def self.true_value
       if postgresql?
->>>>>>> ce/master
         "'t'"
       else
         1

scripts/prepare_build.sh

@@ -20,32 +20,12 @@ sed -i 's/username:.*/username: root/g' config/database.yml
 sed -i 's/password:.*/password:/g' config/database.yml
 sed -i 's/# socket:.*/host: mysql/g' config/database.yml
 
-<<<<<<< HEAD
-    cp config/database_geo.yml.mysql config/database_geo.yml
-    sed -i 's/username:.*/username: root/g' config/database_geo.yml
-    sed -i 's/password:.*/password:/g' config/database_geo.yml
-    sed -i 's/# socket:.*/host: mysql/g' config/database_geo.yml
+cp config/database_geo.yml.mysql config/database_geo.yml
+sed -i 's/username:.*/username: root/g' config/database_geo.yml
+sed -i 's/password:.*/password:/g' config/database_geo.yml
+sed -i 's/# socket:.*/host: mysql/g' config/database_geo.yml
 
-    cp config/resque.yml.example config/resque.yml
-    sed -i 's/localhost/redis/g' config/resque.yml
-
-    export FLAGS="--path vendor --retry 3 --quiet"
-else
-    rnd=$(awk 'BEGIN { srand() ; printf("%d\n",rand()*5) }')
-    export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/bin"
-    cp config/database.yml.mysql config/database.yml
-    sed "s/username\:.*$/username\: runner/" -i config/database.yml
-    sed "s/password\:.*$/password\: 'password'/" -i config/database.yml
-    sed "s/gitlabhq_test/gitlabhq_test_$rnd/" -i config/database.yml
-
-    cp config/database_geo.yml.mysql config/database_geo.yml
-    sed "s/username\:.*$/username\: runner/" -i config/database_geo.yml
-    sed "s/password\:.*$/password\: 'password'/" -i config/database_geo.yml
-    sed "s/gitlabhq_test/gitlabhq_test_$rnd/" -i config/database_geo.yml
-fi
-=======
 cp config/resque.yml.example config/resque.yml
 sed -i 's/localhost/redis/g' config/resque.yml
 
 export FLAGS="--path vendor --retry 3 --quiet"
->>>>>>> ce/master

spec/models/repository_spec.rb

@@ -1972,7 +1972,6 @@ describe Repository, models: true do
     end
   end
 
-<<<<<<< HEAD
   describe '#after_sync' do
     it 'expires repository cache' do
       expect(repository).to receive(:expire_all_method_caches)
@@ -1988,8 +1987,6 @@ describe Repository, models: true do
     rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id)
   end
 
-=======
->>>>>>> ce/master
   # TODO: Uncomment when feature is reenabled
   # describe '#is_ancestor?' do
   #   context 'Gitaly is_ancestor feature enabled' do

spec/spec_helper.rb

@@ -60,14 +60,11 @@ RSpec.configure do |config|
     TestEnv.init
   end
 
-<<<<<<< HEAD
   config.before(:all) do
     License.destroy_all
     TestLicense.init
   end
 
-=======
->>>>>>> ce/master
   config.after(:suite) do
     TestEnv.cleanup
   end