Merge branch '214218-feature-flag-enable-sort_discussions' into 'master'

Resolve "[Feature flag] Enable sort_discussions"

See merge request gitlab-org/gitlab!29492

app/controllers/projects/issues_controller.rb

@@ -50,10 +50,6 @@ class Projects::IssuesController < Projects::ApplicationController
     push_frontend_feature_flag(:save_issuable_health_status, project.group, default_enabled: true)
   end
 
-  before_action only: :show do
-    push_frontend_feature_flag(:sort_discussions, @project)
-  end
-
   around_action :allow_gitaly_ref_name_caching, only: [:discussions]
 
   respond_to :html

app/controllers/projects/merge_requests_controller.rb

@@ -31,10 +31,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
   end
 
-  before_action only: :show do
-    push_frontend_feature_flag(:sort_discussions, @project)
-  end
-
   around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
 
   def index

app/views/projects/issues/show.html.haml

@@ -87,8 +87,7 @@
       .col-md-12.col-lg-6.js-noteable-awards
         = render 'award_emoji/awards_block', awardable: @issue, inline: true
       .col-md-12.col-lg-6.new-branch-col
-        - if Feature.enabled?(:sort_discussions, @project)
-          #js-vue-sort-issue-discussions
+        #js-vue-sort-issue-discussions
         #js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@issue), notes_filters: UserPreference.notes_filters.to_json } }
         = render 'new_branch' if show_new_branch_button?
 

app/views/projects/merge_requests/_awards_block.html.haml

@@ -2,6 +2,5 @@
   = render 'award_emoji/awards_block', awardable: @merge_request, inline: true do
     - if mr_tabs_position_enabled?
       .ml-auto.mt-auto.mb-auto
-        - if Feature.enabled?(:sort_discussions, @merge_request.target_project)
-          #js-vue-sort-issue-discussions
+        #js-vue-sort-issue-discussions
         = render "projects/merge_requests/discussion_filter"

changelogs/unreleased/214218-feature-flag-enable-sort_discussions.yml

+---
+title: Allow sorting of issue and MR discussions
+merge_request: 29492
+author:
+type: added