Fix merge conflicts on CE Upstream merge

.gitlab-ci.yml

@@ -325,11 +325,7 @@ trigger_docs:
   cache: {}
   artifacts: {}
   script:
-<<<<<<< HEAD
     - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ee https://gitlab.com/api/v3/projects/1794617/trigger/builds"
-=======
-    - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ce https://gitlab.com/api/v3/projects/1794617/trigger/builds"
->>>>>>> ce/master
   only:
     - master@gitlab-org/gitlab-ee
 

app/controllers/admin/application_settings_controller.rb

@@ -133,20 +133,16 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :elasticsearch_port,
       :usage_ping_enabled,
       :enabled_git_access_protocol,
-<<<<<<< HEAD
       :repository_size_limit,
-=======
       :housekeeping_enabled,
       :housekeeping_bitmaps_enabled,
       :housekeeping_incremental_repack_period,
       :housekeeping_full_repack_period,
       :housekeeping_gc_period,
       repository_storages: [],
->>>>>>> ce/master
       restricted_visibility_levels: [],
       import_sources: [],
-      disabled_oauth_sign_in_sources: [],
-      repository_storages: []
+      disabled_oauth_sign_in_sources: []
     )
   end
 end

app/views/search/results/_commit.html.haml

-<<<<<<< HEAD
 = render 'projects/commits/commit', project: commit.project, commit: commit, ref: nil
-=======
-= render 'projects/commits/commit', project: @project, commit: commit, ref: nil
->>>>>>> ce/master

config/routes/group.rb

@@ -14,45 +14,6 @@ end
 
 resources :groups, only: [:index, :new, :create]
 
-<<<<<<< HEAD
-    scope module: :groups do
-      ## EE-specific
-      resource :analytics, only: [:show]
-      resource :ldap, only: [] do
-        member do
-          put :sync
-        end
-      end
-
-      resources :ldap_group_links, only: [:index, :create, :destroy]
-      ## EE-specific
-
-      resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
-        post :resend_invite, on: :member
-        delete :leave, on: :collection
-      end
-
-      resource :avatar, only: [:destroy]
-      resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
-      resources :labels, except: [:show], constraints: { id: /\d+/ }
-
-      ## EE-specific
-      resource :notification_setting, only: [:update]
-      resources :audit_events, only: [:index]
-      ## EE-specific
-    end
-
-    ## EE-specific
-    resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ }, module: :groups do
-      member do
-        get :test
-      end
-    end
-    ## EE-specific
-  end
-
-  get 'groups/:id' => 'groups#show', as: :group_canonical
-=======
 scope(path: 'groups/:id', controller: :groups) do
   get :edit, as: :edit_group
   get :issues, as: :issues_group
@@ -62,6 +23,17 @@ scope(path: 'groups/:id', controller: :groups) do
 end
 
 scope(path: 'groups/:group_id', module: :groups, as: :group) do
+  ## EE-specific
+  resource :analytics, only: [:show]
+  resource :ldap, only: [] do
+    member do
+      put :sync
+    end
+  end
+
+  resources :ldap_group_links, only: [:index, :create, :destroy]
+  ## EE-specific
+
   resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
     post :resend_invite, on: :member
     delete :leave, on: :collection
@@ -70,8 +42,20 @@ scope(path: 'groups/:group_id', module: :groups, as: :group) do
   resource :avatar, only: [:destroy]
   resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
   resources :labels, except: [:show], constraints: { id: /\d+/ }
->>>>>>> ce/master
+
+  ## EE-specific
+  resource :notification_setting, only: [:update]
+  resources :audit_events, only: [:index]
+  ## EE-specific
+end
+
+## EE-specific
+resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ }, module: :groups do
+  member do
+    get :test
+  end
 end
+## EE-specific
 
 # Must be last route in this file
 get 'groups/:id' => 'groups#show', as: :group_canonical

config/routes/project.rb

@@ -338,16 +338,14 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only:
         end
       end
 
-<<<<<<< HEAD
       ## EE-specific
       resources :audit_events, only: [:index]
       ## EE-specific
-=======
+
       # Since both wiki and repository routing contains wildcard characters
       # its preferable to keep it below all other project routes
       draw :wiki
       draw :repository
->>>>>>> ce/master
     end
   end
 end

spec/features/global_search_spec.rb

 require 'spec_helper'
 
-<<<<<<< HEAD
-feature 'Global elastic search', feature: true do
-=======
 feature 'Global search', feature: true do
->>>>>>> ce/master
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
 
   before do
-<<<<<<< HEAD
     stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
     Gitlab::Elastic::Helper.create_empty_index
 
-=======
->>>>>>> ce/master
     project.team << [user, :master]
     login_with(user)
   end
 
-<<<<<<< HEAD
   after do
     Gitlab::Elastic::Helper.delete_index
     stub_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
@@ -30,12 +22,6 @@ feature 'Global search', feature: true do
       create_list(:issue, 21, project: project, title: 'initial')
 
       Gitlab::Elastic::Helper.refresh_index
-=======
-  describe 'I search through the issues and I see pagination' do
-    before do
-      allow_any_instance_of(Gitlab::SearchResults).to receive(:per_page).and_return(1)
-      create_list(:issue, 2, project: project, title: 'initial')
->>>>>>> ce/master
     end
 
     it "has a pagination" do
@@ -48,7 +34,6 @@ feature 'Global search', feature: true do
       expect(page).to have_selector('.gl-pagination .page', count: 2)
     end
   end
-<<<<<<< HEAD
 
   describe 'I search through the blobs' do
     before do
@@ -86,6 +71,4 @@ feature 'Global search', feature: true do
       expect(page).to have_selector('.commit-row-description')
     end
   end
-=======
->>>>>>> ce/master
 end

spec/models/project_spec.rb

@@ -296,7 +296,6 @@ describe Project, models: true do
     end
   end
 
-<<<<<<< HEAD
   describe "#kerberos_url_to_repo" do
     let(:project) { create(:empty_project, path: "somewhere") }
 
@@ -305,10 +304,7 @@ describe Project, models: true do
     end
   end
 
-  xdescribe "#new_issue_address" do
-=======
   describe "#new_issue_address" do
->>>>>>> ce/master
     let(:project) { create(:empty_project, path: "somewhere") }
     let(:user) { create(:user) }
 

spec/spec_helper.rb

@@ -29,11 +29,7 @@ RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers,   type: :controller
   config.include Warden::Test::Helpers, type: :request
   config.include LoginHelpers,          type: :feature
-<<<<<<< HEAD
-  config.include SearchHelpers,       type: :feature
-=======
   config.include SearchHelpers,         type: :feature
->>>>>>> ce/master
   config.include StubConfiguration
   config.include EmailHelpers
   config.include TestEnv