Fix merge conflicts for ce-to-ee-2018-11-02

app/controllers/concerns/project_unauthorized.rb

 # frozen_string_literal: true
 
 module ProjectUnauthorized
-<<<<<<< HEAD
   prepend EE::ProjectUnauthorized
-=======
->>>>>>> upstream/master
+
   extend ActiveSupport::Concern
 
   # EE would override this

app/controllers/projects/clusters_controller.rb

 # frozen_string_literal: true
 
 class Projects::ClustersController < Clusters::ClustersController
-<<<<<<< HEAD
   prepend EE::Projects::ClustersController
 
   include ProjectUnauthorized
@@ -9,13 +8,6 @@ class Projects::ClustersController < Clusters::ClustersController
   prepend_before_action :project
   before_action :repository
 
-=======
-  include ProjectUnauthorized
-
-  prepend_before_action :project
-  before_action :repository
-
->>>>>>> upstream/master
   layout 'project'
 
   private

app/helpers/clusters_helper.rb

 # frozen_string_literal: true
 
 module ClustersHelper
-<<<<<<< HEAD
   prepend EE::ClustersHelper
 
-=======
->>>>>>> upstream/master
   # EE overrides this
   def has_multiple_clusters?
     false

app/views/clusters/clusters/_integration_form.html.haml

-<<<<<<< HEAD:app/views/clusters/clusters/_integration_form.html.haml
-= form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'cluster_integration_form' } do |field|
-=======
 = form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster do |field|
->>>>>>> upstream/master:app/views/clusters/clusters/_integration_form.html.haml
   = form_errors(@cluster)
   .form-group
     %h5= s_('ClusterIntegration|Integration status')

config/routes.rb

@@ -99,12 +99,9 @@ Rails.application.routes.draw do
       end
 
       member do
-<<<<<<< HEAD
         # EE specific
         get :metrics, format: :json
 
-=======
->>>>>>> upstream/master
         scope :applications do
           post '/:application', to: 'clusters/applications#create', as: :install_applications
         end