Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 20 insertions, 0 deletions

diff --git a/app/controllers/projects/redirect_controller.rb b/app/controllers/projects/redirect_controller.rb
new file mode 100644
index 00000000000..6bcbe87ee42
--- /dev/null
+++ b/app/controllers/projects/redirect_controller.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# Projects::RedirectController is used to resolve the route projects/:id.
+# It's helpful for this to be in its own controller so that the
+# ProjectsController can assume that :namespace_id exists
+class Projects::RedirectController < ::ApplicationController
+  skip_before_action :authenticate_user!
+
+  feature_category :projects
+
+  def redirect_from_id
+    project = Project.find(params[:id])
+
+    if can?(current_user, :read_project, project)
+      redirect_to project
+    else
+      render_404
+    end
+  end
+end