Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 4 insertions, 5 deletions

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f0ddd62e996..a5666cb70ac 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -8,6 +8,7 @@ class ProjectsController < Projects::ApplicationController
   include SendFileUpload
   include RecordUserLastActivity
   include ImportUrlParams
+  include FiltersEvents
 
   prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) }
 
@@ -21,7 +22,6 @@ class ProjectsController < Projects::ApplicationController
   before_action :assign_ref_vars, if: -> { action_name == 'show' && repo_exists? }
   before_action :tree,
     if: -> { action_name == 'show' && repo_exists? && project_view_files? }
-  before_action :lfs_blob_ids, if: :show_blob_ids?, only: :show
   before_action :project_export_enabled, only: [:export, :download_export, :remove_export, :generate_new_export]
   before_action :present_project, only: [:edit]
   before_action :authorize_download_code!, only: [:refs]
@@ -38,6 +38,7 @@ class ProjectsController < Projects::ApplicationController
   before_action only: [:new, :create] do
     frontend_experimentation_tracking_data(:new_create_project_ui, 'click_tab')
     push_frontend_feature_flag(:new_create_project_ui) if experiment_enabled?(:new_create_project_ui)
+    push_frontend_feature_flag(:service_desk_custom_address, @project)
   end
 
   layout :determine_layout
@@ -301,10 +302,6 @@ class ProjectsController < Projects::ApplicationController
 
   private
 
-  def show_blob_ids?
-    repo_exists? && project_view_files? && Feature.disabled?(:vue_file_list, @project, default_enabled: true)
-  end
-
   # Render project landing depending of which features are available
   # So if page is not available in the list it renders the next page
   #
@@ -395,6 +392,7 @@ class ProjectsController < Projects::ApplicationController
       :initialize_with_readme,
       :autoclose_referenced_issues,
       :suggestion_commit_message,
+      :service_desk_enabled,
 
       project_feature_attributes: %i[
         builds_access_level
@@ -409,6 +407,7 @@ class ProjectsController < Projects::ApplicationController
       ],
       project_setting_attributes: %i[
         show_default_award_emojis
+        squash_option
       ]
     ]
   end