Merge branch '202680-allow-users-to-be-marked-as-bots' into 'master'

Allow custom bot types

Closes #202680

See merge request gitlab-org/gitlab!24852

ee/app/models/ee/user_bot_type_enums.rb

@@ -10,10 +10,9 @@ module EE
       override :bots
       def bots
         # When adding a new key, please ensure you are not redefining a key that already exists in app/models/user_bot_types_enums.rb
-        super.merge(
-          support_bot: 1,
-          visual_review_bot: 3
-        )
+        bots_hash = super.merge(support_bot: 1, visual_review_bot: 3)
+        bots_hash[:custom] = 99 if ::Gitlab.com?
+        bots_hash
       end
     end
   end

ee/lib/analytics/productivity_calculator.rb

@@ -19,7 +19,9 @@ module Analytics
 
     # rubocop: disable CodeReuse/ActiveRecord
     def first_comment_at
-      merge_request.related_notes.by_humans.where.not(author_id: merge_request.author_id).fresh.first&.created_at
+      merge_request.related_notes.by_humans
+        .where.not(author_id: merge_request.author_id)
+        .fresh.first&.created_at
     end
     # rubocop: enable CodeReuse/ActiveRecord