Resolve conflicts

app/models/epic.rb

 # Placeholder class for model that is implemented in EE
 # It reserves '&' as a reference prefix, but the table does not exists in CE
 class Epic < ActiveRecord::Base
-<<<<<<< HEAD
   prepend EE::Epic
 
-=======
->>>>>>> upstream/master
   def self.reference_prefix
     '&'
   end

app/policies/group_policy.rb

@@ -39,10 +39,7 @@ class GroupPolicy < BasePolicy
 
   rule { guest }.policy do
     enable :read_group
-<<<<<<< HEAD
     enable :read_list
-=======
->>>>>>> upstream/master
     enable :upload_file
   end
 

config/routes/group.rb

@@ -57,7 +57,6 @@ constraints(GroupUrlConstrainer.new) do
         get ":secret/:filename", action: :show, as: :show, constraints: { filename: /[^\/]+/ }
       end
     end
-<<<<<<< HEAD
 
     ## EE-specific
     resource :analytics, only: [:show]
@@ -97,8 +96,6 @@ constraints(GroupUrlConstrainer.new) do
     end
     get 'boards(/*extra_params)', as: :legacy_ee_group_boards_redirect, to: legacy_ee_group_boards_redirect
     ## EE-specific
-=======
->>>>>>> upstream/master
   end
 
   scope(path: '*id',

lib/banzai/filter/epic_reference_filter.rb

@@ -2,11 +2,8 @@ module Banzai
   module Filter
     # The actual filter is implemented in the EE mixin
     class EpicReferenceFilter < IssuableReferenceFilter
-<<<<<<< HEAD
       prepend EE::Banzai::Filter::EpicReferenceFilter
 
-=======
->>>>>>> upstream/master
       self.reference_type = :epic
 
       def self.object_class

lib/banzai/filter/upload_link_filter.rb

@@ -28,15 +28,11 @@ module Banzai
       end
 
       def build_url(uri)
-<<<<<<< HEAD
         base_path = if Gitlab::Geo.secondary?
                       Gitlab::Geo.primary_node.url
                     else
                       Gitlab.config.gitlab.url
                     end
-=======
-        base_path = Gitlab.config.gitlab.url
->>>>>>> upstream/master
 
         if group
           urls = Gitlab::Routing.url_helpers

lib/banzai/reference_parser/epic_parser.rb

@@ -2,11 +2,8 @@ module Banzai
   module ReferenceParser
     # The actual parser is implemented in the EE mixin
     class EpicParser < IssuableParser
-<<<<<<< HEAD
       prepend EE::Banzai::ReferenceParser::EpicParser
 
-=======
->>>>>>> upstream/master
       self.reference_type = :epic
 
       def records_for_nodes(_nodes)

spec/helpers/boards_helper_spec.rb

 require 'spec_helper'
 
 describe BoardsHelper do
-<<<<<<< HEAD
   describe '#build_issue_link_base' do
     it 'returns correct path for project board' do
       @project = create(:project)
@@ -25,7 +24,9 @@ describe BoardsHelper do
 
         expect(build_issue_link_base).to eq('/base/sub/:project_path/issues')
       end
-=======
+    end
+  end
+
   describe '#board_data' do
     let(:user) { create(:user) }
     let(:project) { create(:project) }
@@ -41,7 +42,6 @@ describe BoardsHelper do
 
     it 'returns a board_lists_path as lists_endpoint' do
       expect(helper.board_data[:lists_endpoint]).to eq(board_lists_path(board))
->>>>>>> upstream/master
     end
   end
 end

spec/lib/banzai/filter/upload_link_filter_spec.rb

@@ -163,8 +163,6 @@ describe Banzai::Filter::UploadLinkFilter do
     end
   end
 
-<<<<<<< HEAD
-=======
   context 'in group context' do
     let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }
     let(:group) { create(:group) }
@@ -193,7 +191,6 @@ describe Banzai::Filter::UploadLinkFilter do
     end
   end
 
->>>>>>> upstream/master
   context 'when project or group context does not exist' do
     let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }