Commit 1f500faa authored by David O'Regan's avatar David O'Regan Committed by Heinrich Lee Yu

Remove epic feature from Incidents

We extend support epic method to
filter out inicdent types.
parent f05e1aec
...@@ -6,7 +6,7 @@ module EE ...@@ -6,7 +6,7 @@ module EE
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
def supports_epic? def supports_epic?
is_a?(Issue) && project.group is_a?(Issue) && !incident? && project.group.present?
end end
def supports_health_status? def supports_health_status?
......
- if issuable_sidebar[:supports_epic] - if issuable_sidebar[:supports_epic]
- if issuable_sidebar[:features_available][:epics] - if issuable_sidebar[:features_available][:epics]
- unless @issuable.labels.map(&:title).include?('incident') #js-vue-sidebar-item-epics-select{ data: { can_edit: can_admin_issue?.to_s, group_id: @project.group.id, issue_id: @issuable.id, epic_issue_id: @issuable.epic_issue&.id } }
#js-vue-sidebar-item-epics-select{ data: { can_edit: can_admin_issue?.to_s, group_id: @project.group.id, issue_id: @issuable.id, epic_issue_id: @issuable.epic_issue&.id } }
- else - else
- unless @issuable.labels.map(&:title).include?('incident') = render 'shared/promotions/promote_epics'
= render 'shared/promotions/promote_epics'
...@@ -29,4 +29,29 @@ RSpec.describe EE::Issuable do ...@@ -29,4 +29,29 @@ RSpec.describe EE::Issuable do
it_behaves_like 'matches_cross_reference_regex? fails fast' it_behaves_like 'matches_cross_reference_regex? fails fast'
end end
end end
describe '#supports_epic?' do
let(:group) { build_stubbed(:group) }
let(:project_with_group) { build_stubbed(:project, group: group) }
let(:project_without_group) { build_stubbed(:project) }
where(:issuable_type, :project, :supports_epic) do
[
[:issue, :project_with_group, true],
[:issue, :project_without_group, false],
[:incident, :project_with_group, false],
[:incident, :project_without_group, false],
[:merge_request, :project_with_group, false],
[:merge_request, :project_without_group, false]
]
end
with_them do
let(:issuable) { build_stubbed(issuable_type, project: send(project)) }
subject { issuable.supports_epic? }
it { is_expected.to eq(supports_epic) }
end
end
end end
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