Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 22 insertions, 1 deletions

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 848625ff6b5..09e7563cefd 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -37,7 +37,7 @@ class ProjectsController < Projects::ApplicationController
   # Experiments
   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_experiment(:new_create_project_ui)
   end
 
   before_action only: [:edit] do
@@ -47,6 +47,17 @@ class ProjectsController < Projects::ApplicationController
 
   layout :determine_layout
 
+  feature_category :projects, [
+                     :index, :show, :new, :create, :edit, :update, :transfer,
+                     :destroy, :resolve, :archive, :unarchive, :toggle_star
+                   ]
+
+  feature_category :source_code_management, [:remove_fork, :housekeeping, :refs]
+  feature_category :issue_tracking, [:preview_markdown, :new_issuable_address]
+  feature_category :importers, [:export, :remove_export, :generate_new_export, :download_export]
+  feature_category :audit_events, [:activity]
+  feature_category :code_review, [:unfoldered_environment_names]
+
   def index
     redirect_to(current_user ? root_path : explore_root_path)
   end
@@ -305,6 +316,16 @@ class ProjectsController < Projects::ApplicationController
     end
   end
 
+  def unfoldered_environment_names
+    return render_404 unless Feature.enabled?(:deployment_filters)
+
+    respond_to do |format|
+      format.json do
+        render json: EnvironmentNamesFinder.new(@project, current_user).execute
+      end
+    end
+  end
+
   private
 
   # Render project landing depending of which features are available