Commit 36d2afe7 authored by Imre Farkas's avatar Imre Farkas

Merge branch 'remove_blocking_issues_count_flag' into 'master'

Remove blocking issues count feature flag

See merge request gitlab-org/gitlab!49818
parents 9a9fbe79 0b8d9085
- allow_weight_sort = viewing_issues && (@project || @group)&.feature_available?(:issue_weights)
= sortable_item(sort_title_weight, page_filter_path(sort: sort_value_weight), sort_title) if allow_weight_sort
- allow_blocking_sort = viewing_issues && Feature.enabled?(:blocking_issues_counts)
- allow_blocking_sort = viewing_issues
= sortable_item(sort_title_blocking, page_filter_path(sort: sort_value_blocking_desc), sort_title) if allow_blocking_sort
- blocking_issues_counts_enabled = Feature.enabled?(:blocking_issues_counts)
- blocking_issues_count = @issuable_meta_data[issuable.id]&.blocking_issues_count || 0
- if blocking_issues_counts_enabled && blocking_issues_count > 0
- if blocking_issues_count > 0
%li.blocking-issues.gl-display-none.gl-display-sm-block.has-tooltip{ data: { testid: 'blocking-issues' }, title: _('Blocking issues') }
= sprite_icon('issue-block', css_class: "gl-vertical-align-middle")
= blocking_issues_count
---
title: Display blocking issues count on issues list
merge_request: 49818
author:
type: added
---
name: blocking_issues_counts
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32340
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/231325
milestone: '13.1'
type: development
group: group::product planning
default_enabled: false
......@@ -7,8 +7,6 @@ module EE
override :metadata_for_issuable
def metadata_for_issuable(id)
return super unless ::Feature.enabled?(:blocking_issues_counts)
super.tap do |data|
blocking_count =
grouped_blocking_issues_count.find do |issue_link|
......
......@@ -32,21 +32,5 @@ RSpec.describe Gitlab::IssuableMetadata do
expect(data[blocking_issue_2.id].blocking_issues_count).to eq(1)
expect(data[blocked_issue_1.id].blocking_issues_count).to eq(0)
end
context 'when blocking_issues_counts feature flag is disabled' do
before do
stub_feature_flags(blocking_issues_counts: false)
end
it 'does not return blocking_issues_counts' do
create(:award_emoji, :upvote, awardable: blocking_issue_1)
meta_data = described_class.new(user, Issue.all.limit(7)).data # rubocop: disable CodeReuse/ActiveRecord
expect(meta_data.values.map { |value| value.blocking_issues_count }.uniq).to eq([nil])
# Make sure other properties are still being fetched
expect(meta_data[blocking_issue_1.id].upvotes).to eq(1)
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