Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0b8d9085
Commit
0b8d9085
authored
Dec 11, 2020
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove blocking issues count feature flag
remove :blocking_issues_counts feature flag
parent
fc7e85ae
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
29 deletions
+7
-29
ee/app/views/shared/ee/issuable/_sort_dropdown.html.haml
ee/app/views/shared/ee/issuable/_sort_dropdown.html.haml
+1
-1
ee/app/views/shared/issuable/_blocking_issues_count.html.haml
...pp/views/shared/issuable/_blocking_issues_count.html.haml
+1
-2
ee/changelogs/unreleased/remove_blocking_issues_count_flag.yml
...angelogs/unreleased/remove_blocking_issues_count_flag.yml
+5
-0
ee/config/feature_flags/development/blocking_issues_counts.yml
...nfig/feature_flags/development/blocking_issues_counts.yml
+0
-8
ee/lib/ee/gitlab/issuable_metadata.rb
ee/lib/ee/gitlab/issuable_metadata.rb
+0
-2
ee/spec/lib/ee/gitlab/issuable_metadata_spec.rb
ee/spec/lib/ee/gitlab/issuable_metadata_spec.rb
+0
-16
No files found.
ee/app/views/shared/ee/issuable/_sort_dropdown.html.haml
View file @
0b8d9085
-
allow_weight_sort
=
viewing_issues
&&
(
@project
||
@group
)
&
.
feature_available?
(
:issue_weights
)
-
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
=
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
=
sortable_item
(
sort_title_blocking
,
page_filter_path
(
sort:
sort_value_blocking_desc
),
sort_title
)
if
allow_blocking_sort
ee/app/views/shared/issuable/_blocking_issues_count.html.haml
View file @
0b8d9085
-
blocking_issues_counts_enabled
=
Feature
.
enabled?
(
:blocking_issues_counts
)
-
blocking_issues_count
=
@issuable_meta_data
[
issuable
.
id
]
&
.
blocking_issues_count
||
0
-
blocking_issues_count
=
@issuable_meta_data
[
issuable
.
id
]
&
.
blocking_issues_count
||
0
-
if
blocking_issues_count
s_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'
)
}
%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"
)
=
sprite_icon
(
'issue-block'
,
css_class:
"gl-vertical-align-middle"
)
=
blocking_issues_count
=
blocking_issues_count
ee/changelogs/unreleased/remove_blocking_issues_count_flag.yml
0 → 100644
View file @
0b8d9085
---
title
:
Display blocking issues count on issues list
merge_request
:
49818
author
:
type
:
added
ee/config/feature_flags/development/blocking_issues_counts.yml
deleted
100644 → 0
View file @
fc7e85ae
---
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
ee/lib/ee/gitlab/issuable_metadata.rb
View file @
0b8d9085
...
@@ -7,8 +7,6 @@ module EE
...
@@ -7,8 +7,6 @@ module EE
override
:metadata_for_issuable
override
:metadata_for_issuable
def
metadata_for_issuable
(
id
)
def
metadata_for_issuable
(
id
)
return
super
unless
::
Feature
.
enabled?
(
:blocking_issues_counts
)
super
.
tap
do
|
data
|
super
.
tap
do
|
data
|
blocking_count
=
blocking_count
=
grouped_blocking_issues_count
.
find
do
|
issue_link
|
grouped_blocking_issues_count
.
find
do
|
issue_link
|
...
...
ee/spec/lib/ee/gitlab/issuable_metadata_spec.rb
View file @
0b8d9085
...
@@ -32,21 +32,5 @@ RSpec.describe Gitlab::IssuableMetadata do
...
@@ -32,21 +32,5 @@ RSpec.describe Gitlab::IssuableMetadata do
expect
(
data
[
blocking_issue_2
.
id
].
blocking_issues_count
).
to
eq
(
1
)
expect
(
data
[
blocking_issue_2
.
id
].
blocking_issues_count
).
to
eq
(
1
)
expect
(
data
[
blocked_issue_1
.
id
].
blocking_issues_count
).
to
eq
(
0
)
expect
(
data
[
blocked_issue_1
.
id
].
blocking_issues_count
).
to
eq
(
0
)
end
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
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment