Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/app/graphql/resolvers/projects/fork_details_resolver.rb b/app/graphql/resolvers/projects/fork_details_resolver.rb
index fcc13a1bc1e..a3c60f55e14 100644
--- a/app/graphql/resolvers/projects/fork_details_resolver.rb
+++ b/app/graphql/resolvers/projects/fork_details_resolver.rb
@@ -13,8 +13,17 @@ module Resolvers
 
       def resolve(**args)
         return unless project.forked?
+        return unless authorized_fork_source?
+        return unless project.repository.branch_exists?(args[:ref])
+        return unless Feature.enabled?(:fork_divergence_counts, project)
 
-        ::Projects::Forks::DivergenceCounts.new(project, args[:ref]).counts
+        ::Projects::Forks::Details.new(project, args[:ref])
+      end
+
+      private
+
+      def authorized_fork_source?
+        Ability.allowed?(current_user, :read_code, project.fork_source)
       end
     end
   end