Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e2bdce8d
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
e2bdce8d
编写于
3月 07, 2018
作者:
R
Riccardo Padovani
提交者:
Sean McGivern
3月 07, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Count discussions on issues and merge requests as contributions for the contributions calendar
上级
cfe203fa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
2 deletion
+9
-2
changelogs/unreleased/feature--43691-count-diff-note-calendar-activity.yml
...ased/feature--43691-count-diff-note-calendar-activity.yml
+1
-1
lib/gitlab/contributions_calendar.rb
lib/gitlab/contributions_calendar.rb
+1
-1
spec/lib/gitlab/contributions_calendar_spec.rb
spec/lib/gitlab/contributions_calendar_spec.rb
+7
-0
未找到文件。
changelogs/unreleased/feature--43691-count-diff-note-calendar-activity.yml
浏览文件 @
e2bdce8d
---
title
:
Count comments on diffs as contributions for the contributions calendar
title
:
Count comments on diffs a
nd discussions a
s contributions for the contributions calendar
merge_request
:
17418
author
:
Riccardo Padovani
type
:
fixed
lib/gitlab/contributions_calendar.rb
浏览文件 @
e2bdce8d
...
...
@@ -23,7 +23,7 @@ module Gitlab
mr_events
=
event_counts
(
date_from
,
:merge_requests
)
.
having
(
action:
[
Event
::
MERGED
,
Event
::
CREATED
,
Event
::
CLOSED
],
target_type:
"MergeRequest"
)
note_events
=
event_counts
(
date_from
,
:merge_requests
)
.
having
(
action:
[
Event
::
COMMENTED
]
,
target_type:
%w(Note DiffNote)
)
.
having
(
action:
[
Event
::
COMMENTED
])
union
=
Gitlab
::
SQL
::
Union
.
new
([
repo_events
,
issue_events
,
mr_events
,
note_events
])
events
=
Event
.
find_by_sql
(
union
.
to_sql
).
map
(
&
:attributes
)
...
...
spec/lib/gitlab/contributions_calendar_spec.rb
浏览文件 @
e2bdce8d
...
...
@@ -77,6 +77,13 @@ describe Gitlab::ContributionsCalendar do
expect
(
calendar
(
contributor
).
activity_dates
[
today
]).
to
eq
(
1
)
end
it
"counts the discussions on merge requests and issues"
do
create_event
(
public_project
,
today
,
0
,
Event
::
COMMENTED
,
:discussion_note_on_merge_request
)
create_event
(
public_project
,
today
,
2
,
Event
::
COMMENTED
,
:discussion_note_on_issue
)
expect
(
calendar
(
contributor
).
activity_dates
[
today
]).
to
eq
(
2
)
end
context
"when events fall under different dates depending on the time zone"
do
before
do
create_event
(
public_project
,
today
,
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录