Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
355289e4
Commit
355289e4
authored
Feb 27, 2020
by
Pavel Shutsin
Committed by
Stan Hu
Mar 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Allow custom bot types"
This reverts custom bot type.
parent
dc0eedf2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
ee/app/models/ee/user_bot_type_enums.rb
ee/app/models/ee/user_bot_type_enums.rb
+4
-3
ee/lib/analytics/merge_request_metrics_calculator.rb
ee/lib/analytics/merge_request_metrics_calculator.rb
+1
-3
No files found.
ee/app/models/ee/user_bot_type_enums.rb
View file @
355289e4
...
@@ -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
...
...
ee/lib/analytics/merge_request_metrics_calculator.rb
View file @
355289e4
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment