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

2 files changed, 33 insertions, 0 deletions

diff --git a/app/controllers/projects/harbor/application_controller.rb b/app/controllers/projects/harbor/application_controller.rb
new file mode 100644
index 00000000000..e6e694783fa
--- /dev/null
+++ b/app/controllers/projects/harbor/application_controller.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Projects
+  module Harbor
+    class ApplicationController < Projects::ApplicationController
+      layout 'project'
+
+      before_action :harbor_registry_enabled!
+      before_action do
+        push_frontend_feature_flag(:harbor_registry_integration)
+      end
+
+      feature_category :integrations
+
+      private
+
+      def harbor_registry_enabled!
+        render_404 unless Feature.enabled?(:harbor_registry_integration)
+      end
+    end
+  end
+end
diff --git a/app/controllers/projects/harbor/repositories_controller.rb b/app/controllers/projects/harbor/repositories_controller.rb
new file mode 100644
index 00000000000..dd3e3dc1978
--- /dev/null
+++ b/app/controllers/projects/harbor/repositories_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Projects
+  module Harbor
+    class RepositoriesController < ::Projects::Harbor::ApplicationController
+      def show
+        render :index
+      end
+    end
+  end
+end