Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 6 deletions

diff --git a/app/controllers/projects/service_desk/custom_email_controller.rb b/app/controllers/projects/service_desk/custom_email_controller.rb
index fb5e87f9a97..7c1623cfcd1 100644
--- a/app/controllers/projects/service_desk/custom_email_controller.rb
+++ b/app/controllers/projects/service_desk/custom_email_controller.rb
@@ -3,7 +3,6 @@
 module Projects
   module ServiceDesk
     class CustomEmailController < Projects::ApplicationController
-      before_action :check_feature_flag_enabled
       before_action :authorize_admin_project!
 
       feature_category :service_desk
@@ -75,10 +74,6 @@ module Projects
           error_message: error_message
         }
       end
-
-      def check_feature_flag_enabled
-        render_404 unless Feature.enabled?(:service_desk_custom_email, @project)
-      end
     end
   end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 119b2ef341a..ef87fedf538 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -42,7 +42,6 @@ class ProjectsController < Projects::ApplicationController
     push_frontend_feature_flag(:highlight_js_worker, @project)
     push_frontend_feature_flag(:remove_monitor_metrics, @project)
     push_frontend_feature_flag(:explain_code_chat, current_user)
-    push_frontend_feature_flag(:service_desk_custom_email, @project)
     push_frontend_feature_flag(:issue_email_participants, @project)
     # TODO: We need to remove the FF eventually when we rollout page_specific_styles
     push_frontend_feature_flag(:page_specific_styles, current_user)