From 4adb461f6a7c8ea2a102a774d0ea053b3a0428f4 Mon Sep 17 00:00:00 2001 From: Terri Chu <tchu@gitlab.com> Date: Tue, 3 Aug 2021 16:15:29 -0400 Subject: [PATCH] Remove feature flag search_sort_issues_by_popularity Changelog: added --- app/helpers/search_helper.rb | 2 +- app/views/search/results/_issuable.html.haml | 2 +- .../development/search_sort_issues_by_popularity.yml | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 config/feature_flags/development/search_sort_issues_by_popularity.yml diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index ae67c7b4178..409a3e65fe3 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -150,7 +150,7 @@ module SearchHelper } ] - if search_service.scope == 'issues' && Feature.enabled?(:search_sort_issues_by_popularity) + if search_service.scope == 'issues' options << { title: _('Popularity'), sortable: true, diff --git a/app/views/search/results/_issuable.html.haml b/app/views/search/results/_issuable.html.haml index 551f5c048bc..63524bbf00e 100644 --- a/app/views/search/results/_issuable.html.haml +++ b/app/views/search/results/_issuable.html.haml @@ -12,7 +12,7 @@ .description.term.gl-px-0 = highlight_and_truncate_issuable(issuable, @search_term, @search_highlight) .col-sm-3.gl-mt-3.gl-sm-mt-0.gl-text-right - - if Feature.enabled?(:search_sort_issues_by_popularity) && issuable.respond_to?(:upvotes_count) && issuable.upvotes_count > 0 + - if issuable.respond_to?(:upvotes_count) && issuable.upvotes_count > 0 %li.issuable-upvotes.gl-list-style-none.has-tooltip{ title: _('Upvotes') } = sprite_icon('thumb-up', css_class: "gl-vertical-align-middle") = issuable.upvotes_count diff --git a/config/feature_flags/development/search_sort_issues_by_popularity.yml b/config/feature_flags/development/search_sort_issues_by_popularity.yml deleted file mode 100644 index 64885f00792..00000000000 --- a/config/feature_flags/development/search_sort_issues_by_popularity.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: search_sort_issues_by_popularity -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65231 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334974 -milestone: '14.1' -type: development -group: group::global search -default_enabled: false -- 2.30.9