1 files changed, 6 insertions, 2 deletions
diff --git a/app/serializers/fork_namespace_entity.rb b/app/serializers/fork_namespace_entity.rb
index fbcdf91a1af..2be37d23a05 100644
--- a/app/serializers/fork_namespace_entity.rb
+++ b/app/serializers/fork_namespace_entity.rb
@@ -13,7 +13,7 @@ class ForkNamespaceEntity < Grape::Entity
   end
 
   expose :forked_project_path do |namespace, options|
-    if forked_project = namespace.find_fork_of(options[:project])
+    if forked_project = options.dig(:forked_projects, namespace.id)
       project_path(forked_project)
     end
   end
@@ -31,7 +31,11 @@ class ForkNamespaceEntity < Grape::Entity
   end
 
   expose :can_create_project do |namespace, options|
-    options[:current_user].can?(:create_projects, namespace)
+    if Feature.enabled?(:fork_project_form, options[:project], default_enabled: :yaml)
+      true
+    else
+      options[:current_user].can?(:create_projects, namespace)
+    end
   end
 
   private