Commit f99b9cc3 authored by Jarka Kadlecová's avatar Jarka Kadlecová

Resolve conflicts

parent eefcffc3
# Placeholder class for model that is implemented in EE # Placeholder class for model that is implemented in EE
# It reserves '&' as a reference prefix, but the table does not exists in CE # It reserves '&' as a reference prefix, but the table does not exists in CE
class Epic < ActiveRecord::Base class Epic < ActiveRecord::Base
<<<<<<< HEAD
prepend EE::Epic prepend EE::Epic
=======
>>>>>>> upstream/master
def self.reference_prefix def self.reference_prefix
'&' '&'
end end
......
...@@ -39,10 +39,7 @@ class GroupPolicy < BasePolicy ...@@ -39,10 +39,7 @@ class GroupPolicy < BasePolicy
rule { guest }.policy do rule { guest }.policy do
enable :read_group enable :read_group
<<<<<<< HEAD
enable :read_list enable :read_list
=======
>>>>>>> upstream/master
enable :upload_file enable :upload_file
end end
......
...@@ -57,7 +57,6 @@ constraints(GroupUrlConstrainer.new) do ...@@ -57,7 +57,6 @@ constraints(GroupUrlConstrainer.new) do
get ":secret/:filename", action: :show, as: :show, constraints: { filename: /[^\/]+/ } get ":secret/:filename", action: :show, as: :show, constraints: { filename: /[^\/]+/ }
end end
end end
<<<<<<< HEAD
## EE-specific ## EE-specific
resource :analytics, only: [:show] resource :analytics, only: [:show]
...@@ -97,8 +96,6 @@ constraints(GroupUrlConstrainer.new) do ...@@ -97,8 +96,6 @@ constraints(GroupUrlConstrainer.new) do
end end
get 'boards(/*extra_params)', as: :legacy_ee_group_boards_redirect, to: legacy_ee_group_boards_redirect get 'boards(/*extra_params)', as: :legacy_ee_group_boards_redirect, to: legacy_ee_group_boards_redirect
## EE-specific ## EE-specific
=======
>>>>>>> upstream/master
end end
scope(path: '*id', scope(path: '*id',
......
...@@ -2,11 +2,8 @@ module Banzai ...@@ -2,11 +2,8 @@ module Banzai
module Filter module Filter
# The actual filter is implemented in the EE mixin # The actual filter is implemented in the EE mixin
class EpicReferenceFilter < IssuableReferenceFilter class EpicReferenceFilter < IssuableReferenceFilter
<<<<<<< HEAD
prepend EE::Banzai::Filter::EpicReferenceFilter prepend EE::Banzai::Filter::EpicReferenceFilter
=======
>>>>>>> upstream/master
self.reference_type = :epic self.reference_type = :epic
def self.object_class def self.object_class
......
...@@ -28,15 +28,11 @@ module Banzai ...@@ -28,15 +28,11 @@ module Banzai
end end
def build_url(uri) def build_url(uri)
<<<<<<< HEAD
base_path = if Gitlab::Geo.secondary? base_path = if Gitlab::Geo.secondary?
Gitlab::Geo.primary_node.url Gitlab::Geo.primary_node.url
else else
Gitlab.config.gitlab.url Gitlab.config.gitlab.url
end end
=======
base_path = Gitlab.config.gitlab.url
>>>>>>> upstream/master
if group if group
urls = Gitlab::Routing.url_helpers urls = Gitlab::Routing.url_helpers
......
...@@ -2,11 +2,8 @@ module Banzai ...@@ -2,11 +2,8 @@ module Banzai
module ReferenceParser module ReferenceParser
# The actual parser is implemented in the EE mixin # The actual parser is implemented in the EE mixin
class EpicParser < IssuableParser class EpicParser < IssuableParser
<<<<<<< HEAD
prepend EE::Banzai::ReferenceParser::EpicParser prepend EE::Banzai::ReferenceParser::EpicParser
=======
>>>>>>> upstream/master
self.reference_type = :epic self.reference_type = :epic
def records_for_nodes(_nodes) def records_for_nodes(_nodes)
......
require 'spec_helper' require 'spec_helper'
describe BoardsHelper do describe BoardsHelper do
<<<<<<< HEAD
describe '#build_issue_link_base' do describe '#build_issue_link_base' do
it 'returns correct path for project board' do it 'returns correct path for project board' do
@project = create(:project) @project = create(:project)
...@@ -25,7 +24,9 @@ describe BoardsHelper do ...@@ -25,7 +24,9 @@ describe BoardsHelper do
expect(build_issue_link_base).to eq('/base/sub/:project_path/issues') expect(build_issue_link_base).to eq('/base/sub/:project_path/issues')
end end
======= end
end
describe '#board_data' do describe '#board_data' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:project) } let(:project) { create(:project) }
...@@ -41,7 +42,6 @@ describe BoardsHelper do ...@@ -41,7 +42,6 @@ describe BoardsHelper do
it 'returns a board_lists_path as lists_endpoint' do it 'returns a board_lists_path as lists_endpoint' do
expect(helper.board_data[:lists_endpoint]).to eq(board_lists_path(board)) expect(helper.board_data[:lists_endpoint]).to eq(board_lists_path(board))
>>>>>>> upstream/master
end end
end end
end end
...@@ -163,8 +163,6 @@ describe Banzai::Filter::UploadLinkFilter do ...@@ -163,8 +163,6 @@ describe Banzai::Filter::UploadLinkFilter do
end end
end end
<<<<<<< HEAD
=======
context 'in group context' do context 'in group context' do
let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') } let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }
let(:group) { create(:group) } let(:group) { create(:group) }
...@@ -193,7 +191,6 @@ describe Banzai::Filter::UploadLinkFilter do ...@@ -193,7 +191,6 @@ describe Banzai::Filter::UploadLinkFilter do
end end
end end
>>>>>>> upstream/master
context 'when project or group context does not exist' do context 'when project or group context does not exist' do
let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') } let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment