Skip to content
代码片段 群组 项目
未验证 提交 18e0c271 编辑于 作者: Brian Williams's avatar Brian Williams 提交者: GitLab
浏览文件

Merge branch '513521-remove-snoozed_todos_sort_order-ff' into 'master'

Remove the `snoozed_todos_sort_order` feature flag

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/181569



Merged-by: default avatarBrian Williams <bwilliams@gitlab.com>
Approved-by: default avatarBrian Williams <bwilliams@gitlab.com>
Approved-by: default avatarMohamed Hamda <mhamda@gitlab.com>
Co-authored-by: default avatarPaul Gascou-Vaillancourt <paul.gascvail@gmail.com>
No related branches found
No related tags found
无相关合并请求
...@@ -168,7 +168,7 @@ def sort(items) ...@@ -168,7 +168,7 @@ def sort(items)
# We only need to surface snoozed to-dos when querying pending items. The special sort order is # We only need to surface snoozed to-dos when querying pending items. The special sort order is
# unnecessary in the `Done` and `All` tabs where we can simply sort by ID (= creation date). # unnecessary in the `Done` and `All` tabs where we can simply sort by ID (= creation date).
def use_snooze_custom_sort? def use_snooze_custom_sort?
Feature.enabled?(:snoozed_todos_sort_order, current_user) && filter_pending_only? filter_pending_only?
end end
def by_action(items) def by_action(items)
......
---
name: snoozed_todos_sort_order
feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/17712
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/178170
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/513521
milestone: '17.9'
group: group::personal productivity
type: beta
default_enabled: false
...@@ -317,24 +317,6 @@ ...@@ -317,24 +317,6 @@
it { is_expected.to eq([todo3, todo2, todo1]) } it { is_expected.to eq([todo3, todo2, todo1]) }
end end
end end
context 'when the snoozed_todos_sort_order feature flag is disabled' do
before do
stub_feature_flags(snoozed_todos_sort_order: false)
end
context 'when sorting by ascending date' do
subject { finder.new(user, { sort: :created_asc }).execute }
it { is_expected.to eq([todo1, todo2, todo3]) }
end
context 'when sorting by descending date' do
subject { finder.new(user, { sort: :created_desc }).execute }
it { is_expected.to eq([todo3, todo2, todo1]) }
end
end
end end
it "sorts by priority" do it "sorts by priority" do
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册