Add latest changes from gitlab-org/gitlab@master

5 files changed, 5 insertions, 12 deletions

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 96650e2cae9..51ad8edb012 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/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
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 038b6146bab..89de40006ff 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/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
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 260ba9ea4a5..9e7589a1f18 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -11,6 +11,9 @@ class Namespace < ApplicationRecord
   include FeatureGate
   include FromUnion
   include Gitlab::Utils::StrongMemoize
+  include IgnorableColumns
+
+  ignore_column :plan_id, remove_with: '13.1', remove_after: '2020-06-22'
 
   # Prevent users from creating unreasonably deep level of nesting.
   # The number 20 was taken based on maximum nesting level of
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 1f499dbd0a2..4fc67884584 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/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?
 
diff --git a/app/views/projects/merge_requests/_awards_block.html.haml b/app/views/projects/merge_requests/_awards_block.html.haml
index c1e92e22590..e4a7b9b7e62 100644
--- a/app/views/projects/merge_requests/_awards_block.html.haml
+++ b/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"