Resolve conflicts in models

app/models/application_setting.rb

@@ -282,7 +282,6 @@ class ApplicationSetting < ActiveRecord::Base
     end
   end
 
-<<<<<<< HEAD
   def elasticsearch_indexing
     License.feature_available?(:elastic_search) && super
   end
@@ -313,10 +312,7 @@ class ApplicationSetting < ActiveRecord::Base
     }
   end
 
-  def home_page_url_column_exist
-=======
   def home_page_url_column_exists?
->>>>>>> ce/master
     ActiveRecord::Base.connection.column_exists?(:application_settings, :home_page_url)
   end
 

app/models/ci/build.rb

@@ -36,12 +36,8 @@ module Ci
     scope :with_artifacts_not_expired, ->() { with_artifacts.where('artifacts_expire_at IS NULL OR artifacts_expire_at > ?', Time.now) }
     scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
     scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) }
-<<<<<<< HEAD
-    scope :manual_actions, ->() { where(when: :manual).relevant }
-    scope :codeclimate, ->() { where(name: 'codeclimate') }
-=======
     scope :manual_actions, ->() { where(when: :manual, status: COMPLETED_STATUSES + [:manual]) }
->>>>>>> ce/master
+    scope :codeclimate, ->() { where(name: 'codeclimate') }
 
     mount_uploader :artifacts_file, ArtifactUploader
     mount_uploader :artifacts_metadata, ArtifactUploader

app/models/project_services/kubernetes_service.rb

@@ -122,7 +122,6 @@ class KubernetesService < DeploymentService
     end
   end
 
-<<<<<<< HEAD
   def rollout_status(environment)
     with_reactive_cache do |data|
       specs = filter_by_label(data[:deployments], app: environment.slug)
@@ -131,21 +130,13 @@ class KubernetesService < DeploymentService
     end
   end
 
-  # Caches all pods & deployments in the namespace so other calls don't need to
-  # block on network access.
-=======
   # Caches resources in the namespace so other calls don't need to block on
   # network access
->>>>>>> ce/master
   def calculate_reactive_cache
     return unless active? && project && !project.pending_delete?
 
     # We may want to cache extra things in the future
-<<<<<<< HEAD
     { pods: read_pods, deployments: read_deployments }
-=======
-    { pods: read_pods }
->>>>>>> ce/master
   end
 
   TEMPLATE_PLACEHOLDER = 'Kubernetes namespace'.freeze
@@ -182,7 +173,6 @@ class KubernetesService < DeploymentService
     []
   end
 
-<<<<<<< HEAD
   def read_deployments
     kubeclient = build_kubeclient!(api_path: 'apis/extensions', api_version: 'v1beta1')
 
@@ -192,8 +182,6 @@ class KubernetesService < DeploymentService
     []
   end
 
-=======
->>>>>>> ce/master
   def kubeclient_ssl_options
     opts = { verify_ssl: OpenSSL::SSL::VERIFY_PEER }