Commit 355289e4 authored by Pavel Shutsin's avatar Pavel Shutsin Committed by Stan Hu

Revert "Allow custom bot types"

This reverts custom bot type.
parent dc0eedf2
...@@ -10,9 +10,10 @@ module EE ...@@ -10,9 +10,10 @@ module EE
override :bots override :bots
def bots def bots
# When adding a new key, please ensure you are not redefining a key that already exists in app/models/user_bot_type_enums.rb # When adding a new key, please ensure you are not redefining a key that already exists in app/models/user_bot_type_enums.rb
bots_hash = super.merge(support_bot: 1, visual_review_bot: 3) super.merge(
bots_hash[:custom] = 99 if ::Gitlab.com? support_bot: 1,
bots_hash visual_review_bot: 3
)
end end
end end
end end
......
...@@ -19,9 +19,7 @@ module Analytics ...@@ -19,9 +19,7 @@ module Analytics
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def first_comment_at def first_comment_at
merge_request.related_notes.by_humans merge_request.related_notes.by_humans.where.not(author_id: merge_request.author_id).fresh.first&.created_at
.where.not(author_id: merge_request.author_id)
.fresh.first&.created_at
end end
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment